September 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51679 - in /trunk/country: VERSION keyboard/src/keyboard.desktop package/yast2-country.changes
by jsuchome＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: jsuchome Date: Mon Sep 29 21:45:36 2008 New Revision: 51679 URL: http://svn.opensuse.org/viewcvs/yast?rev=51679&view=rev Log: - keyboard configuration is in hardware category (bnc#430606) - 2.17.15 Modified: trunk/country/VERSION trunk/country/keyboard/src/keyboard.desktop trunk/country/package/yast2-country.changes Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=51679&r1=516… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Mon Sep 29 21:45:36 2008 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: trunk/country/keyboard/src/keyboard.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/keyboard.de… ============================================================================== --- trunk/country/keyboard/src/keyboard.desktop (original) +++ trunk/country/keyboard/src/keyboard.desktop Mon Sep 29 21:45:36 2008 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-System; +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Hardware; X-KDE-ModuleType=Library X-KDE-RootOnly=true Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Mon Sep 29 21:45:36 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 29 21:41:12 CEST 2008 - jsuchome(a)suse.cz + +- keyboard configuration is in hardware category (bnc#430606) +- 2.17.15 + +------------------------------------------------------------------- Mon Sep 29 15:50:31 CEST 2008 - jsuchome(a)suse.cz - save system time from ntpdate to HW clock (#429079) -- 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] r51678 - /tags/stable-2_17_35/yast2/
by visnov＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: visnov Date: Mon Sep 29 21:33:10 2008 New Revision: 51678 URL: http://svn.opensuse.org/viewcvs/yast?rev=51678&view=rev Log: Created tag stable-2_17_35 for yast2 Added: tags/stable-2_17_35/yast2/ - copied from r51677, trunk/yast2/ -- 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] r51677 - /tags/stable-2_17_35/
by visnov＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: visnov Date: Mon Sep 29 21:33:06 2008 New Revision: 51677 URL: http://svn.opensuse.org/viewcvs/yast?rev=51677&view=rev Log: Created tag stable-2_17_35 Added: tags/stable-2_17_35/ -- 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] r51676 - in /trunk/yast2: VERSION package/yast2.changes scripts/save_y2logs
by visnov＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: visnov Date: Mon Sep 29 21:32:51 2008 New Revision: 51676 URL: http://svn.opensuse.org/viewcvs/yast?rev=51676&view=rev Log: save also zypp history in save_y2logs Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes trunk/yast2/scripts/save_y2logs Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=51676&r1=51675… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Sep 29 21:32:51 2008 @@ -1 +1 @@ -2.17.34 +2.17.35 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Sep 29 21:32:51 2008 @@ -2,6 +2,8 @@ Mon Sep 29 16:52:39 CEST 2008 - visnov(a)suse.cz - updated man page with exit codes +- save also zypp history in save_y2logs +- 2.17.35 ------------------------------------------------------------------- Fri Sep 29 14:55:50 CEST 2008 - tgoettlicher(a)suse.de Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=51… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Mon Sep 29 21:32:51 2008 @@ -50,6 +50,10 @@ LIST="$LIST $( cd /var/log/; ls evms-engine.*)" fi +if [ -f /var/log/zypp/history ]; then + LIST="$LIST $( cd /var/log/; ls zypp/history*)" +fi + RPM_LIST="rpm-qa" if [ -f /var/lib/rpm/Packages ]; then rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST -- 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] r51675 - /trunk/gtk/src/ygtkprogressbar.c
by rpmcruz＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: rpmcruz Date: Mon Sep 29 20:41:59 2008 New Revision: 51675 URL: http://svn.opensuse.org/viewcvs/yast?rev=51675&view=rev Log: Tweak. Modified: trunk/gtk/src/ygtkprogressbar.c Modified: trunk/gtk/src/ygtkprogressbar.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkprogressbar.c?rev=51… ============================================================================== --- trunk/gtk/src/ygtkprogressbar.c (original) +++ trunk/gtk/src/ygtkprogressbar.c Mon Sep 29 20:41:59 2008 @@ -82,9 +82,13 @@ ybar->dist = 0.10; ybar->vel = 0.02; #endif - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (ybar), 0); + gtk_progress_bar_set_fraction (bar, 0); } else { + if (ybar->fraction == 0 && fraction == 1) { + gtk_progress_bar_set_fraction (bar, 1); + return; + } gdouble delta_t = delta_time (&ybar->time_i); if (delta_t > 10 || fraction < ybar->fraction || !GTK_WIDGET_REALIZED (bar)) { ybar->fraction = fraction; -- 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] r51674 - /tags/stable-2_17_23/bootloader/
by juhliarik＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: juhliarik Date: Mon Sep 29 17:29:06 2008 New Revision: 51674 URL: http://svn.opensuse.org/viewcvs/yast?rev=51674&view=rev Log: Created tag stable-2_17_23 for bootloader Added: tags/stable-2_17_23/bootloader/ - copied from r51673, trunk/bootloader/ -- 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] r51673 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: juhliarik Date: Mon Sep 29 17:28:55 2008 New Revision: 51673 URL: http://svn.opensuse.org/viewcvs/yast?rev=51673&view=rev Log: new version 2.17.23 Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=51673&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Mon Sep 29 17:28:55 2008 @@ -1 +1 @@ -2.17.22 +2.17.23 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Mon Sep 29 17:28:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 29 17:10:36 CEST 2008 - juhliarik(a)suse.cz + +- added new dialog for updating from lilo to grub (bnc #430579) +- 2.17.23 + +------------------------------------------------------------------- Mon Sep 29 15:45:41 CEST 2008 - jsrain(a)suse.cz - fixed no scrren contents after changing loader type (bnc #427622) -- 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] r51672 - in /trunk/bootloader: src/clients/Makefile.am src/clients/inst_lilo_convert.ycp src/routines/section_widgets.ycp yast2-bootloader.spec.in
by juhliarik＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: juhliarik Date: Mon Sep 29 17:10:19 2008 New Revision: 51672 URL: http://svn.opensuse.org/viewcvs/yast?rev=51672&view=rev Log: added new dialog during update from lilo A bootloader/src/clients/inst_lilo_convert.ycp M bootloader/src/clients/Makefile.am M bootloader/src/routines/section_widgets.ycp M bootloader/yast2-bootloader.spec.in Added: trunk/bootloader/src/clients/inst_lilo_convert.ycp Modified: trunk/bootloader/src/clients/Makefile.am trunk/bootloader/src/routines/section_widgets.ycp trunk/bootloader/yast2-bootloader.spec.in Modified: trunk/bootloader/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/Makefile.… ============================================================================== --- trunk/bootloader/src/clients/Makefile.am (original) +++ trunk/bootloader/src/clients/Makefile.am Mon Sep 29 17:10:19 2008 @@ -8,7 +8,8 @@ bootloader_proposal.ycp \ bootloader_finish.ycp \ print-product.ycp \ - inst_bootloader.ycp + inst_bootloader.ycp \ + inst_lilo_convert.ycp EXTRA_DIST = \ $(client_DATA) Added: trunk/bootloader/src/clients/inst_lilo_convert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/clients/inst_lilo… ============================================================================== --- trunk/bootloader/src/clients/inst_lilo_convert.ycp (added) +++ trunk/bootloader/src/clients/inst_lilo_convert.ycp Mon Sep 29 17:10:19 2008 @@ -0,0 +1,151 @@ +/** + * File: + * bootloader/routines/inst_bootloader.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Functions to write "dummy" config files for kernel + * + * Authors: + * Jozef Uhliarik <juhliarik(a)suse.cz> + * + * + */ + +{ + +textdomain "bootloader"; + +import "Bootloader"; +import "BootCommon"; +import "Installation"; +import "GetInstArgs"; +import "Mode"; +import "Label"; +import "Wizard"; +import "Popup"; +import "Pkg"; + +y2milestone ("starting inst_lilo_convert"); + + + + + +void selectPackage() +{ + if (! Pkg::IsSelected("grub")) + { + Pkg::PkgInstall ("grub"); + Pkg::PkgSolve (false); + } +} + +void convertSettings() +{ + + string lilo_conf = (string) WFM::Read(.local.string, Installation::destdir + "/etc/lilo.conf"); + BootCommon::setLoaderType("lilo"); + map<string,string> new_files = $[]; + new_files["/etc/lilo.conf"] = lilo_conf; + y2milestone("/etc/lilo.conf : %1", new_files); + BootCommon::ProposeDeviceMap (); + BootCommon::SetDeviceMap(BootCommon::device_mapping); + map<string,string> old_files = BootCommon::GetFilesContents (); + new_files["/boot/grub/device.map"] = old_files["/boot/grub/device.map"]:""; + y2milestone("added device.map : %1", new_files); + BootCommon::SetFilesContents (new_files); + BootCommon::setLoaderType("grub"); + + map<string,string> tmp_files = BootCommon::GetFilesContents (); + + foreach (string file, string content, tmp_files, + { + + integer last=findlastof(file,"/"); + string path_file = substring (file, 0, last); + WFM::Execute(.local.mkdir, Installation::destdir + path_file); + y2milestone ("writing file: %1", file); + WFM::Write(.local.string, Installation::destdir + file, content); + }); +} + + + + +if ( GetInstArgs::going_back()) // going backwards? +{ + return `auto; // don't execute this once more +} + +if (Mode::update()) +{ + + // save some sysconfig variables + // register new agent pointing into the mounted filesystem + path sys_agent = .target.sysconfig.bootloader; + + string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; + SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini(`SysConfigFile(target_sysconfig_path))); + + string bl = (string) SCR::Read(add(sys_agent,.LOADER_TYPE)); + + term convert_question = `VBox( + `HBox ( + `HStretch(), + `RadioButtonGroup(`id(`convert), + `HSquash ( + `VBox(`Left(`Label("LILO is not supported. The recommended option is select convert LILO to GRUB")), + `Left(`Label("Do you want convert settings and install GRUB?")), + `Left(`RadioButton(`id("lilo"), _("Stay LILO"))), + `Left(`RadioButton(`id("grub"), _("Convert Settings and Install GRUB"), true )) + ) + ) + ), + `HStretch() + ) + ); + any ret = nil; + if (bl == "lilo") + { + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("bootloader"); + Wizard::SetContentsButtons("Converting LILO to GRUB", convert_question, + _("LILO is not supported. The recommended option is select convert LILO to GRUB"), + Label::BackButton(), Label::NextButton()); + UI::ChangeWidget(`id(`abort),`Label, Label::CancelButton()); + UI::ChangeWidget(`id(`abort), `Enabled, false); + + while (true) + { + ret = UI::UserInput(); + string current = (string) UI::QueryWidget(`id(`convert), `CurrentButton); + // One of those dialog buttons have been pressed + if (ret == `next) + { + selectPackage(); + convertSettings(); + SCR::Write (add(sys_agent,.LOADER_TYPE), "grub"); + SCR::Write (sys_agent, nil); + } + break; + + } + UI::CloseDialog(); + } + + if (ret == `back) + return `back; + + if (ret == `next) + return `next; + +} + +y2milestone ("finish inst_lilo_convert"); + +return `auto; + +} Modified: trunk/bootloader/src/routines/section_widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/section_… ============================================================================== --- trunk/bootloader/src/routines/section_widgets.ycp (original) +++ trunk/bootloader/src/routines/section_widgets.ycp Mon Sep 29 17:10:19 2008 @@ -318,7 +318,9 @@ else { BootCommon::current_section["name"] = ""; - BootCommon::current_section["original_name"] = ""; + // FIXME: the problem with missing YaST commnet in menu.lst + // it seems be correct if original_name stay same... + // BootCommon::current_section["original_name"] = ""; BootCommon::current_section["__auto"] = false; BootCommon::current_section["lines_cache_id"] = ""; } Modified: trunk/bootloader/yast2-bootloader.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/yast2-bootloader.spec… ============================================================================== --- trunk/bootloader/yast2-bootloader.spec.in (original) +++ trunk/bootloader/yast2-bootloader.spec.in Mon Sep 29 17:10:19 2008 @@ -57,6 +57,7 @@ @clientdir@/bootloader*.ycp @clientdir@/print-product.ycp @clientdir@/inst_bootl*.ycp +@clientdir@/inst_lilo_convert.ycp @ybindir@/* @agentdir@/ag_* @scrconfdir@/*.scr -- 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] r51671 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/YGDialog.h src/YGDumbTab.cc src/YGMenuButton.cc src/YGUtils.h src/YGWizard.cc src/ygtkwizard.c
by rpmcruz＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: rpmcruz Date: Mon Sep 29 17:08:12 2008 New Revision: 51671 URL: http://svn.opensuse.org/viewcvs/yast?rev=51671&view=rev Log: * src/ygtkwizard.h/c & src/YGDialog.h/cc: use dialog directly to set title/icon. * src/YGWizard.cc: support for setDialogTitle(). Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGDumbTab.cc trunk/gtk/src/YGMenuButton.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/YGWizard.cc trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=51671&r1=51670… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Sep 29 17:08:12 2008 @@ -1,3 +1,10 @@ +2008-09-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkwizard.h/c & src/YGDialog.h/cc: use dialog directly + to set title/icon. + + * src/YGWizard.cc: support for setDialogTitle(). + 2008-09-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/ygtkfindentry.h/c: added support embed context menu which pairs Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=51671&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Mon Sep 29 17:08:12 2008 @@ -5,6 +5,7 @@ #include <config.h> #include "YGUI.h" #include "YGDialog.h" +#include "YGUtils.h" #if YAST2_VERSION >= 2017006 #include <YDialogSpy.h> #endif @@ -36,8 +37,8 @@ GdkCursor *m_busyCursor; public: - YGWindowCloseFn m_canClose; - void *m_canCloseData; + YGWindowCloseFn m_canClose; + void *m_canCloseData; YGWindow (bool _main_window, YGDialog *ydialog) { @@ -312,6 +313,7 @@ YGWidget (this, NULL, FALSE, GTK_TYPE_HBOX, NULL) { setBorder (0); + m_stickyTitle = false; m_containee = gtk_event_box_new(); if (dialogType == YMainDialog && main_window) m_window = main_window; @@ -483,6 +485,31 @@ previousWidget = ywidget; } +void YGDialog::setTitle (const std::string &title, bool sticky) +{ + if (!m_stickyTitle || sticky) { + GtkWindow *window = GTK_WINDOW (m_window->getWidget()); + gchar *str; + if (title.empty()) + str = g_strdup ("YaST"); + else + str = g_strdup_printf ("%s - YaST", title.c_str()); + gtk_window_set_title (window, str); + g_free (str); + m_stickyTitle = sticky; + } +} + +void YGDialog::setIcon (const std::string &icon) +{ + GtkWindow *window = GTK_WINDOW (m_window->getWidget()); + GdkPixbuf *pixbuf = YGUtils::loadPixbuf (icon); + if (pixbuf) { + gtk_window_set_icon (window, pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } +} + YDialog *YGWidgetFactory::createDialog (YDialogType dialogType, YDialogColorMode colorMode) { IMPL Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=51671&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Mon Sep 29 17:08:12 2008 @@ -12,6 +12,7 @@ friend class YGWindow; GtkWidget *m_containee; YGWindow *m_window; + bool m_stickyTitle; public: YGDialog (YDialogType dialogType, YDialogColorMode colorMode); @@ -40,6 +41,9 @@ virtual void highlight (YWidget * child); + void setTitle (const std::string &title, bool sticky = false); + void setIcon (const std::string &icon); + YGWIDGET_IMPL_CHILD_ADDED (m_containee) YGWIDGET_IMPL_CHILD_REMOVED (m_containee) }; Modified: trunk/gtk/src/YGDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDumbTab.cc?rev=51671&r… ============================================================================== --- trunk/gtk/src/YGDumbTab.cc (original) +++ trunk/gtk/src/YGDumbTab.cc Mon Sep 29 17:08:12 2008 @@ -51,8 +51,10 @@ if (item->hasIconName()) { string path = iconFullPath (item->iconName()); GdkPixbuf *pixbuf = YGUtils::loadPixbuf (path); - if (pixbuf) + if (pixbuf) { image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } } if (image) { tab_label = gtk_hbox_new (FALSE, 6); Modified: trunk/gtk/src/YGMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGMenuButton.cc?rev=5167… ============================================================================== --- trunk/gtk/src/YGMenuButton.cc (original) +++ trunk/gtk/src/YGMenuButton.cc Mon Sep 29 17:08:12 2008 @@ -38,8 +38,10 @@ if ((*it)->hasIconName()) { GdkPixbuf *pixbuf = YGUtils::loadPixbuf ((*it)->iconName()); - if (pixbuf) + if (pixbuf) { image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } } if (image) { Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=51671&r1=5… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Mon Sep 29 17:08:12 2008 @@ -42,6 +42,8 @@ /* Sets some widget font proprities. */ void setWidgetFont (GtkWidget *widget, PangoWeight weight, double scale); + /* Saves some code and standardizes the error. Returns NULL if failed. + Don't forget to g_object_unref it! */ GdkPixbuf *loadPixbuf (const std::string &fileneme); /* Tries to make sense out of the string, applying some stock icon to the button. */ Modified: trunk/gtk/src/YGWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWizard.cc?rev=51671&r1… ============================================================================== --- trunk/gtk/src/YGWizard.cc (original) +++ trunk/gtk/src/YGWizard.cc Mon Sep 29 17:08:12 2008 @@ -13,13 +13,6 @@ #include "YReplacePoint.h" #include "YGDialog.h" - -// FIXME: wizard events need to be ported -// We'll probably want to also make YGtkWizard buttons actual YGPushButtons... -// (let's just create them and pass button->getWidget() to the wizard...) -// (or let's just improve on the wrapper and id.) - - class YGWizard : public YWizard, public YGWidget { YReplacePoint *m_replacePoint; @@ -135,7 +128,8 @@ virtual ~YGWizard() { - // m_back/abort/next_button are added as children and will be freed by ~YContainerWidget + // m_back/abort/next_button are added as children and + // so will be freed by ~YContainerWidget } inline YGtkWizard *getWizard() @@ -165,11 +159,18 @@ { if (!ygtk_wizard_set_header_icon (getWizard(), icon.c_str())) yuiWarning() << "YGWizard: could not load image: " << icon << endl; + YGDialog::currentDialog()->setIcon (icon); } virtual void setDialogHeading (const string &heading) { ygtk_wizard_set_header_text (getWizard(), heading.c_str()); + YGDialog::currentDialog()->setTitle (heading, false); + } + + virtual void setDialogTitle (const string &title) + { + YGDialog::currentDialog()->setTitle (title, true); } virtual void addStep (const string &text, const string &id) Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=51671&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Mon Sep 29 17:08:12 2008 @@ -308,11 +308,6 @@ static void ygtk_wizard_header_set_icon (YGtkWizardHeader *header, GdkPixbuf *pixbuf) { gtk_image_set_from_pixbuf (GTK_IMAGE (header->icon), pixbuf); } -static const gchar *ygtk_wizard_header_get_title (YGtkWizardHeader *header) -{ return gtk_label_get_text (GTK_LABEL (header->title)); } -static GdkPixbuf *ygtk_wizard_header_get_icon (YGtkWizardHeader *header) -{ return gtk_image_get_pixbuf (GTK_IMAGE (header->icon)); } - //** YGtkWizard // callbacks @@ -698,30 +693,9 @@ return TRUE; } -static void sync_window_title (YGtkWizard *wizard) -{ - GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (wizard)); - if (GTK_WIDGET_TOPLEVEL (window)) { - const gchar *_title = ygtk_wizard_header_get_title ( - YGTK_WIZARD_HEADER (wizard->m_title)); - char *title; - if (*_title == '\0') - title = g_strdup ("YaST"); - else - title = g_strdup_printf ("%s - YaST", _title); - GdkPixbuf *pixbuf = ygtk_wizard_header_get_icon ( - YGTK_WIZARD_HEADER (wizard->m_title)); - - gtk_window_set_title (GTK_WINDOW (window), title); - gtk_window_set_icon (GTK_WINDOW (window), pixbuf); - g_free (title); - } -} - void ygtk_wizard_set_header_text (YGtkWizard *wizard, const char *text) { ygtk_wizard_header_set_title (YGTK_WIZARD_HEADER (wizard->m_title), text); - sync_window_title (wizard); } gboolean ygtk_wizard_set_header_icon (YGtkWizard *wizard, const char *icon) @@ -732,7 +706,6 @@ return FALSE; ygtk_wizard_header_set_icon (YGTK_WIZARD_HEADER (wizard->m_title), pixbuf); g_object_unref (G_OBJECT (pixbuf)); - sync_window_title (wizard); return TRUE; } -- 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] r51670 - in /trunk/yast2: doc/yast2.8 package/yast2.changes
by visnov＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: visnov Date: Mon Sep 29 16:55:13 2008 New Revision: 51670 URL: http://svn.opensuse.org/viewcvs/yast?rev=51670&view=rev Log: updated man page with exit codes Modified: trunk/yast2/doc/yast2.8 trunk/yast2/package/yast2.changes Modified: trunk/yast2/doc/yast2.8 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/doc/yast2.8?rev=51670&r1=5… ============================================================================== --- trunk/yast2/doc/yast2.8 (original) +++ trunk/yast2/doc/yast2.8 Mon Sep 29 16:55:13 2008 @@ -179,6 +179,24 @@ \" Please report bugs at http://www.suse.de/feedback .\" .\" +.SH "EXIT STATUS" +.TP +.if !'po4a'hide' .B 0 +Successful program execution. +.TP +.if !'po4a'hide' .B 1 +Too few arguments. +.TP +.if !'po4a'hide' .B 5 +Error in arguments. +.TP +.if !'po4a'hide' .B 16 +Generic module error. +.TP +.if !'po4a'hide' .B > 16 +Module specific error codes. +.\" +.\" .SH AUTHOR .nf Michal Svec <msvec(a)suse.cz> - manual page Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Sep 29 16:55:13 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 29 16:52:39 CEST 2008 - visnov(a)suse.cz + +- updated man page with exit codes + +------------------------------------------------------------------- Fri Sep 29 14:55:50 CEST 2008 - tgoettlicher(a)suse.de - Fixed bnc #418443: Yast modules windows have no title -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0