June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48007 - in /branches/SuSE-Linux-11_0-Branch/packager: VERSION package/yast2-packager.changes src/modules/SlideShowCallbacks.ycp
by lslezak＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: lslezak Date: Tue Jun 3 15:32:00 2008 New Revision: 48007 URL: http://svn.opensuse.org/viewcvs/yast?rev=48007&view=rev Log: - Display the error message properly in the media change popup. (bnc#395328) - 2.16.53 Modified: branches/SuSE-Linux-11_0-Branch/packager/VERSION branches/SuSE-Linux-11_0-Branch/packager/package/yast2-packager.changes branches/SuSE-Linux-11_0-Branch/packager/src/modules/SlideShowCallbacks.ycp Modified: branches/SuSE-Linux-11_0-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/packag… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/packager/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/packager/VERSION Tue Jun 3 15:32:00 2008 @@ -1 +1 @@ -2.16.52 +2.16.53 Modified: branches/SuSE-Linux-11_0-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/packag… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Linux-11_0-Branch/packager/package/yast2-packager.changes Tue Jun 3 15:32:00 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 3 15:09:36 CEST 2008 - lslezak(a)suse.cz + +- Display the error message properly in the media change popup. + (bnc#395328) +- 2.16.53 + +------------------------------------------------------------------- Fri May 23 15:28:19 CEST 2008 - lslezak(a)suse.cz - reserve more space for the table in the repository manager, Modified: branches/SuSE-Linux-11_0-Branch/packager/src/modules/SlideShowCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/packag… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/packager/src/modules/SlideShowCallbacks.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/packager/src/modules/SlideShowCallbacks.ycp Tue Jun 3 15:32:00 2008 @@ -511,7 +511,7 @@ SlideShow::StopTimer(); } - string ret = PackageCallbacks::MediaChange(error_code, error_code, url, product, current, current_label, wanted, + string ret = PackageCallbacks::MediaChange(error_code, error, url, product, current, current_label, wanted, wanted_label, double_sided, devices, current_device); if (!Mode::normal ()) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48006 - in /trunk/theme/openSUSE/icons: 22x22/apps/yast-squid.png 32x32/apps/yast-squid.png 48x48/apps/yast-squid.png
by jimmacfx＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: jimmacfx Date: Tue Jun 3 15:26:58 2008 New Revision: 48006 URL: http://svn.opensuse.org/viewcvs/yast?rev=48006&view=rev Log: Squid icon. Addresses bug #392940 Added: trunk/theme/openSUSE/icons/22x22/apps/yast-squid.png trunk/theme/openSUSE/icons/32x32/apps/yast-squid.png trunk/theme/openSUSE/icons/48x48/apps/yast-squid.png Added: trunk/theme/openSUSE/icons/22x22/apps/yast-squid.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/22x22/apps/yast-squid.png (added) and trunk/theme/openSUSE/icons/22x22/apps/yast-squid.png Tue Jun 3 15:26:58 2008 differ Added: trunk/theme/openSUSE/icons/32x32/apps/yast-squid.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/32x32/apps/yast-squid.png (added) and trunk/theme/openSUSE/icons/32x32/apps/yast-squid.png Tue Jun 3 15:26:58 2008 differ Added: trunk/theme/openSUSE/icons/48x48/apps/yast-squid.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Files trunk/theme/openSUSE/icons/48x48/apps/yast-squid.png (added) and trunk/theme/openSUSE/icons/48x48/apps/yast-squid.png Tue Jun 3 15:26:58 2008 differ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48005 - in /branches/SuSE-Linux-11_0-Branch/installation: VERSION package/yast2-installation.changes src/modules/ImageInstallation.ycp
by locilka＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: locilka Date: Tue Jun 3 15:15:00 2008 New Revision: 48005 URL: http://svn.opensuse.org/viewcvs/yast?rev=48005&view=rev Log: - Always use --numeric-owner (always use numbers for user/group names) when deploying images (bnc #396689). - 2.16.50 Modified: branches/SuSE-Linux-11_0-Branch/installation/VERSION branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes branches/SuSE-Linux-11_0-Branch/installation/src/modules/ImageInstallation.ycp Modified: branches/SuSE-Linux-11_0-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/instal… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/installation/VERSION Tue Jun 3 15:15:00 2008 @@ -1 +1 @@ -2.16.49 +2.16.50 Modified: branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/instal… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Linux-11_0-Branch/installation/package/yast2-installation.changes Tue Jun 3 15:15:00 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 3 15:11:15 CEST 2008 - locilka(a)suse.cz + +- Always use --numeric-owner (always use numbers for user/group + names) when deploying images (bnc #396689). +- 2.16.50 + +------------------------------------------------------------------- Mon Jun 2 12:33:57 CEST 2008 - locilka(a)suse.cz - Return `next when going back to the automatic configuration Modified: branches/SuSE-Linux-11_0-Branch/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/instal… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/installation/src/modules/ImageInstallation.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/installation/src/modules/ImageInstallation.ycp Tue Jun 3 15:15:00 2008 @@ -214,13 +214,13 @@ // lzma if (regexpmatch (image, "\.lzma$")) { cmd = sformat ( - "lzmadec < '%1' | tar --totals --checkpoint=%3 --record-size=%4 -C '%2' -xf -", + "lzmadec < '%1' | tar --numeric-owner --totals --checkpoint=%3 --record-size=%4 -C '%2' -xf -", String::Quote (image), String::Quote (target), _checkpoint, _record_size ); // bzip2, gzip } else { cmd = sformat ( - "tar --checkpoint=%3 --record-size=%4 --totals -C '%2' -xf '%1'", + "tar --numeric-owner --checkpoint=%3 --record-size=%4 --totals -C '%2' -xf '%1'", String::Quote (image), String::Quote (target), _checkpoint, _record_size ); } @@ -791,10 +791,10 @@ cmd = sformat ( "mkfifo %3 ; mkfifo %4 ; - tar -C %1 -cSf %3 --one-file-system . & + tar -C %1 --numeric-owner -cSf %3 --one-file-system . & dd bs=1048576 if=%3 of=%4 >&2 & jobs -l >&2; - tar -C %2 -xSf %4", + tar -C %2 --numeric-owner -xSf %4", from, to, tmp_pipe1, tmp_pipe2); y2milestone ("Executing %1", cmd); integer process = (integer)SCR::Execute(.process.start_shell, cmd, $[]); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48004 - in /trunk/installation: package/yast2-installation.changes src/modules/ImageInstallation.ycp
by locilka＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: locilka Date: Tue Jun 3 15:13:23 2008 New Revision: 48004 URL: http://svn.opensuse.org/viewcvs/yast?rev=48004&view=rev Log: - Always use --numeric-owner (always use numbers for user/group names) when deploying images (bnc #396689). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jun 3 15:13:23 2008 @@ -3,6 +3,8 @@ - Umounting temporary directory in inst_pre_install (if already mounted) before new mount is called. +- Always use --numeric-owner (always use numbers for user/group + names) when deploying images (bnc #396689). ------------------------------------------------------------------- Mon Jun 2 12:33:57 CEST 2008 - locilka(a)suse.cz Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Tue Jun 3 15:13:23 2008 @@ -214,13 +214,13 @@ // lzma if (regexpmatch (image, "\.lzma$")) { cmd = sformat ( - "lzmadec < '%1' | tar --totals --checkpoint=%3 --record-size=%4 -C '%2' -xf -", + "lzmadec < '%1' | tar --numeric-owner --totals --checkpoint=%3 --record-size=%4 -C '%2' -xf -", String::Quote (image), String::Quote (target), _checkpoint, _record_size ); // bzip2, gzip } else { cmd = sformat ( - "tar --checkpoint=%3 --record-size=%4 --totals -C '%2' -xf '%1'", + "tar --numeric-owner --checkpoint=%3 --record-size=%4 --totals -C '%2' -xf '%1'", String::Quote (image), String::Quote (target), _checkpoint, _record_size ); } @@ -791,10 +791,10 @@ cmd = sformat ( "mkfifo %3 ; mkfifo %4 ; - tar -C %1 -cSf %3 --one-file-system . & + tar -C %1 --numeric-owner -cSf %3 --one-file-system . & dd bs=1048576 if=%3 of=%4 >&2 & jobs -l >&2; - tar -C %2 -xSf %4", + tar -C %2 --numeric-owner -xSf %4", from, to, tmp_pipe1, tmp_pipe2); y2milestone ("Executing %1", cmd); integer process = (integer)SCR::Execute(.process.start_shell, cmd, $[]); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48003 - in /trunk/qt: package/yast2-qt.changes src/QY2DiskUsageList.cc
by tgoettlicher＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: tgoettlicher Date: Tue Jun 3 15:08:37 2008 New Revision: 48003 URL: http://svn.opensuse.org/viewcvs/yast?rev=48003&view=rev Log: limited bar width in disk usage list to 100% Modified: trunk/qt/package/yast2-qt.changes trunk/qt/src/QY2DiskUsageList.cc Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Jun 3 15:08:37 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jun 3 13:42:19 CEST 2008 - tgoettlicher(a)suse.de + +- limited bar width in disk usage list to 100% + +------------------------------------------------------------------- Thu May 29 17:57:08 CEST 2008 - sh(a)suse.de - Fixed bnc #394525: Proxy settings don't work in installer Modified: trunk/qt/src/QY2DiskUsageList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2DiskUsageList.cc?rev=4… ============================================================================== --- trunk/qt/src/QY2DiskUsageList.cc (original) +++ trunk/qt/src/QY2DiskUsageList.cc Tue Jun 3 15:08:37 2008 @@ -332,7 +332,7 @@ if ( w > 0 ) { - fillWidth = (int) ( w * usedPercent() / 100.0 ); + fillWidth = (int) ( w * percent / 100.0 ); // Fill the desired percentage. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48002 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_pre_install.ycp
by locilka＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: locilka Date: Tue Jun 3 13:46:44 2008 New Revision: 48002 URL: http://svn.opensuse.org/viewcvs/yast?rev=48002&view=rev Log: - Umounting temporary directory in inst_pre_install (if already mounted) before new mount is called. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_pre_install.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Jun 3 13:46:44 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 3 13:44:56 CEST 2008 - locilka(a)suse.cz + +- Umounting temporary directory in inst_pre_install (if already + mounted) before new mount is called. + +------------------------------------------------------------------- Mon Jun 2 12:33:57 CEST 2008 - locilka(a)suse.cz - Return `next when going back to the automatic configuration Modified: trunk/installation/src/clients/inst_pre_install.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_pre_install.ycp (original) +++ trunk/installation/src/clients/inst_pre_install.ycp Tue Jun 3 13:46:44 2008 @@ -108,6 +108,17 @@ string partition_device = (string) partition["device"]:""; y2milestone("Mounting %1 to %2", partition_device, mnt_tmpdir); + string already_mounted = sformat ("grep '[\\t ]%1[\\t ]' /proc/mounts", mnt_tmpdir); + integer am_exit = (integer) SCR::Execute (.target.bash, already_mounted); + + if (am_exit != 0) { + y2warning ("%1 is already mounted, trying to umount...", mnt_tmpdir); + integer umount = (integer) SCR::Execute (.target.umount, mnt_tmpdir); + if (umount != 0) { + y2error ("Cannot umount %1", mnt_tmpdir); + } + } + // mounting read-only if (! (boolean) SCR::Execute(.target.mount, [partition_device, mnt_tmpdir], "-o ro")) { y2error("Mounting falied!"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48001 - /trunk/qt/src/YQWizard.cc
by sh-sh-sh＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: sh-sh-sh Date: Tue Jun 3 12:55:04 2008 New Revision: 48001 URL: http://svn.opensuse.org/viewcvs/yast?rev=48001&view=rev Log: indentation Modified: trunk/qt/src/YQWizard.cc Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=48001&r1=… ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Tue Jun 3 12:55:04 2008 @@ -740,7 +740,7 @@ _helpButton->setShortcut( Qt::Key_F1 ); connect( _helpButton, SIGNAL( clicked() ), - this, SLOT ( showHelp() ) ); + this, SLOT ( showHelp() ) ); hbox->addWidget( _helpButton ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48000 - /branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes
by coolo＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: coolo Date: Tue Jun 3 07:54:29 2008 New Revision: 48000 URL: http://svn.opensuse.org/viewcvs/yast?rev=48000&view=rev Log: sync with autobuild Modified: branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes Modified: branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes Tue Jun 3 07:54:29 2008 @@ -10,9 +10,9 @@ Mon May 19 11:05:00 BST 2008 - mmichael(a)suse.de - Update to version 2.16.12 -* make PackageSelector more usable bnc #390471# -* impl. mnemonics on frames bnc #390244# -* fix window transience (hidden popups) bnc #389635# +* make PackageSelector more usable bnc #390471 +* impl. mnemonics on frames bnc #390244 +* fix window transience (hidden popups) bnc #389635 * add recommended/selected to categories * tag main package-selector buttons for translation * calm progress bar warnings (for stupid values eg. -5%) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47999 - in /branches/SuSE-Linux-11_0-Branch/gtk: ChangeLog VERSION package/yast2-gtk.changes src/YGUI.cc src/YGi18n.h src/ygtkwizard.c
by coolo＠svn.opensuse.org 03 Jun '08

03 Jun '08

Author: coolo Date: Tue Jun 3 07:51:03 2008 New Revision: 47999 URL: http://svn.opensuse.org/viewcvs/yast?rev=47999&view=rev Log: backporting and increasing version number Modified: branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog branches/SuSE-Linux-11_0-Branch/gtk/VERSION branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c Modified: branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/Ch… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Linux-11_0-Branch/gtk/ChangeLog Tue Jun 3 07:51:03 2008 @@ -1,3 +1,15 @@ +2008-06-02 Michael Meeks <michael.meeks(a)novell.com> + + * src/YGUI.cc (YGApplication::makeScreenShot), + * src/ygtkwizard.c (ygtk_help_dialog_init), + * src/ygtkwizard.c (sync_window_title): tag more missing + strings for translation in the next version bug #395803# + +2008-06-02 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGUI.cc: fixed bug 395484. Wrong check that assumed error + was set, crashing... + 2008-05-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGDialog.cc: bug fix: seems like we shouldn't unref the Modified: branches/SuSE-Linux-11_0-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/gtk/VERSION Tue Jun 3 07:51:03 2008 @@ -1 +1 @@ -2.16.12 +2.16.13 Modified: branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_0-Branch/gtk/package/yast2-gtk.changes Tue Jun 3 07:51:03 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jun 3 07:46:59 CEST 2008 - coolo(a)suse.de + +- Update to version 2.16.13 +* tag more missing strings for translation (bnc#395803) +* fixed bnc#395484 +* various fixes in the package selector by Ricardo + +------------------------------------------------------------------- Mon May 19 11:05:00 BST 2008 - mmichael(a)suse.de - Update to version 2.16.12 Modified: branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc (original) +++ branches/SuSE-Linux-11_0-Branch/gtk/src/YGUI.cc Tue Jun 3 07:51:03 2008 @@ -349,7 +349,7 @@ GtkWidget *widget = GTK_WIDGET (YGDialog::currentWindow()); if (!widget) { if (interactive) - errorMsg ("No dialog to take screenshot of."); + errorMsg (_("No dialog to take screenshot of.")); return; } @@ -361,7 +361,7 @@ if (!shot) { if (interactive) - errorMsg ("Couldn't take a screenshot."); + errorMsg (_("Couldn't take a screenshot.")); return; } @@ -413,13 +413,15 @@ } yuiDebug() << "Saving screen shot to " << filename << endl; - if (gdk_pixbuf_save (shot, filename.c_str(), "png", &error, NULL)) { - yuiError() << "Couldn't save screen shot " << filename << endl; - if (interactive) { - string msg = "Couldn't save screenshot to file " + filename - + " - " + error->message; - errorMsg (msg.c_str()); + if (!gdk_pixbuf_save (shot, filename.c_str(), "png", &error, NULL)) { + string msg = _("Couldn't save screenshot to file ") + filename; + if (error) { + msg += "\n"; + msg += std::string ("\n") + error->message; } + yuiError() << msg << endl; + if (interactive) + errorMsg (msg.c_str()); goto makeScreenShot_ret; } Modified: branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h (original) +++ branches/SuSE-Linux-11_0-Branch/gtk/src/YGi18n.h Tue Jun 3 07:51:03 2008 @@ -25,15 +25,16 @@ #define TEXTDOMAIN "yast2-gtk" -inline const char * _( const char * msgid ) +static inline const char * _( const char * msgid ) { return ( !msgid || !*msgid ) ? "" : dgettext( TEXTDOMAIN, msgid ); } -inline const char * _( const char * msgid1, const char * msgid2, unsigned long int n ) +#ifndef YGI18N_C +static inline const char * _( const char * msgid1, const char * msgid2, unsigned long int n ) { return dngettext( TEXTDOMAIN, msgid1, msgid2, n ); } - +#endif #endif // YGi18n_h Modified: branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c (original) +++ branches/SuSE-Linux-11_0-Branch/gtk/src/ygtkwizard.c Tue Jun 3 07:51:03 2008 @@ -14,6 +14,8 @@ #include "ygtkhtmlwrap.h" #include "ygtksteps.h" #include "ygtkfindentry.h" +#define YGI18N_C +#include "YGi18n.h" #define BUTTONS_SPACING 12 #define BORDER 4 @@ -75,7 +77,7 @@ gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_title (GTK_WINDOW (dialog), "Help"); + gtk_window_set_title (GTK_WINDOW (dialog), _("Help")); gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 350); // title @@ -86,7 +88,7 @@ gtk_container_set_border_width (GTK_CONTAINER (dialog->title_box), 6); dialog->title_image = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_LARGE_TOOLBAR); - dialog->title_label = gtk_label_new ("Help"); + dialog->title_label = gtk_label_new (_("Help")); set_label_header (dialog->title_label, 0); gtk_box_pack_start (GTK_BOX (dialog->title_box), dialog->title_image, FALSE, FALSE, 0); @@ -613,9 +615,9 @@ const gchar *_title = gtk_label_get_text (GTK_LABEL (wizard->m_title_label)); char *title; if (*_title == '\0') - title = g_strdup ("YaST"); + title = g_strdup (_("YaST")); else - title = g_strdup_printf ("%s - YaST", _title); + title = g_strdup_printf (_("%s - YaST"), _title); GdkPixbuf *pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (wizard->m_title_image)); gtk_window_set_title (GTK_WINDOW (window), title); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r47998 - /trunk/installation/src/clients/inst_system_analysis.ycp
by locilka＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: locilka Date: Mon Jun 2 18:24:49 2008 New Revision: 47998 URL: http://svn.opensuse.org/viewcvs/yast?rev=47998&view=rev Log: Removing some obsolete stuff... Modified: trunk/installation/src/clients/inst_system_analysis.ycp Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sy… ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Mon Jun 2 18:24:49 2008 @@ -198,52 +198,6 @@ // <-- Function definitions - - -map display_info = UI::GetDisplayInfo(); -boolean in_textmode = display_info["TextMode"]:false; - -string GenerateIconID (any icon_whatever) { - return sformat ("icon_%1", tostring (icon_whatever)); -} - -/** - * Function creates term containing radio button and icon - * based on current display (graphical/textual) - * - * @param string radio button label - * @param symbol radio button id - * @param string path to an image - * @boolean whether selected (more than one buttons selected don't make sense!) - */ - term CreateRadioButtonTerm (string button_label, symbol button_id, string icon_file, boolean selected) { - return `HBox ( - (in_textmode ? - `Empty() - : - `HWeight ( - 1, - (icon_file == "" ? - `Empty() - : - `Image (`id (GenerateIconID (button_id)), icon_file, "") - ) - ) - ), - `HWeight( - 5, - `Left (`RadioButton ( - `id (button_id), - `opt(`notify), - button_label, - selected - )) - ) - ); -} - - - Wizard::SetContents (_("Analyzing the Computer"), `Empty (), "", false, false); Wizard::SetTitleIcon ("yast-controller"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0