November 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52829 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call startup/YaST2.ssh
by aschnell＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: aschnell Date: Mon Nov 3 14:29:38 2008 New Revision: 52829 URL: http://svn.opensuse.org/viewcvs/yast?rev=52829&view=rev Log: - better reboot message during ssh installation (bnc #439572) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call trunk/installation/startup/YaST2.ssh Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52829&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Nov 3 14:29:38 2008 @@ -1 +1 @@ -2.17.24 +2.17.25 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 Mon Nov 3 14:29:38 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 03 14:28:14 CET 2008 - aschnell(a)suse.de + +- better reboot message during ssh installation (bnc #439572) +- 2.17.25 + +------------------------------------------------------------------- Fri Oct 31 16:28:23 CET 2008 - locilka(a)suse.cz - Fixed checking whether running the second stage is required. Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Mon Nov 3 14:29:38 2008 @@ -476,6 +476,22 @@ fi } + +function ssh_reboot_message() +{ + echo "*** Preparing SSH installation for reboot ***" + + if [ -f /etc/install.inf ] ; then + SecondStageRequired=$(awk ' /^SecondStageRequired:/ { print $2 }' < /etc/install.inf) + fi + + if [ -n "$SecondStageRequired" -a "$SecondStageRequired" = "1" ] ; then + echo "*** NOTE: after reboot, you have to reconnect and call ***" + echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***" + fi +} + + #----[ start_yast ]----# function start_yast () { #------------------------------------------------------ @@ -548,9 +564,7 @@ log "\t$Y2_OK_MESSAGE" fi if [ $SELECTED_MEDIUM = "SSH" ] && [ ! "$VNC" = 1 ];then - echo "*** Preparing SSH installation for reboot ***" - echo "*** NOTE: after reboot, you have to reconnect and call ***" - echo "*** /usr/lib/YaST2/startup/YaST2.ssh ***" + ssh_reboot_message log "\tPreparing SSH installation for reboot" echo $Y2_EXIT_CODE > /tmp/YaST2_ssh_installation_finished fi Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Mon Nov 3 14:29:38 2008 @@ -37,7 +37,7 @@ cat <<-EOF Your system has been updated and needs to reboot ... - + Reconnect to the system after it reboots and call /usr/lib/YaST2/startup/YaST2.ssh again to continue the installation ... @@ -49,7 +49,7 @@ cat <<-EOF File /var/lib/YaST2/runme_at_boot does not exist ... - + Not running YaST ... EOF -- 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] r52828 - in /trunk/branding: yast2-branding-SLED.changes yast2-branding-SLED.spec yast2-branding-SLES.changes yast2-branding-SLES.spec yast2-branding-openSUSE.changes yast2-branding-openSUSE.spec
by coolo＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: coolo Date: Mon Nov 3 12:54:07 2008 New Revision: 52828 URL: http://svn.opensuse.org/viewcvs/yast?rev=52828&view=rev Log: fix "missing icons on openSUSE" bug Modified: trunk/branding/yast2-branding-SLED.changes trunk/branding/yast2-branding-SLED.spec trunk/branding/yast2-branding-SLES.changes trunk/branding/yast2-branding-SLES.spec trunk/branding/yast2-branding-openSUSE.changes trunk/branding/yast2-branding-openSUSE.spec Modified: trunk/branding/yast2-branding-SLED.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLED.cha… ============================================================================== --- trunk/branding/yast2-branding-SLED.changes (original) +++ trunk/branding/yast2-branding-SLED.changes Mon Nov 3 12:54:07 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 3 12:53:27 CET 2008 - coolo(a)suse.de + +- require the branding package + +------------------------------------------------------------------- Mon Oct 6 18:28:24 CEST 2008 - sbrabec(a)suse.cz - Conflict with other branding providers (FATE#304881). Modified: trunk/branding/yast2-branding-SLED.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLED.spe… ============================================================================== --- trunk/branding/yast2-branding-SLED.spec (original) +++ trunk/branding/yast2-branding-SLED.spec Mon Nov 3 12:54:07 2008 @@ -31,6 +31,7 @@ Provides: yast2-branding Conflicts: otherproviders(yast2-branding) Requires: yast2-theme-SLE +Requires: branding-SLED Summary: SLED branding for YaST %description Modified: trunk/branding/yast2-branding-SLES.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLES.cha… ============================================================================== --- trunk/branding/yast2-branding-SLES.changes (original) +++ trunk/branding/yast2-branding-SLES.changes Mon Nov 3 12:54:07 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 3 12:53:27 CET 2008 - coolo(a)suse.de + +- require the branding package + +------------------------------------------------------------------- Mon Oct 6 18:28:24 CEST 2008 - sbrabec(a)suse.cz - Conflict with other branding providers (FATE#304881). Modified: trunk/branding/yast2-branding-SLES.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-SLES.spe… ============================================================================== --- trunk/branding/yast2-branding-SLES.spec (original) +++ trunk/branding/yast2-branding-SLES.spec Mon Nov 3 12:54:07 2008 @@ -31,6 +31,7 @@ Provides: yast2-branding Conflicts: otherproviders(yast2-branding) Requires: yast2-theme-SLE +Requires: branding-SLES Summary: SLES branding for YaST %description Modified: trunk/branding/yast2-branding-openSUSE.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-openSUSE… ============================================================================== --- trunk/branding/yast2-branding-openSUSE.changes (original) +++ trunk/branding/yast2-branding-openSUSE.changes Mon Nov 3 12:54:07 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Nov 3 12:53:27 CET 2008 - coolo(a)suse.de + +- require the branding package + +------------------------------------------------------------------- Mon Oct 6 18:28:24 CEST 2008 - sbrabec(a)suse.cz - Conflict with other branding providers (FATE#304881). Modified: trunk/branding/yast2-branding-openSUSE.spec URL: http://svn.opensuse.org/viewcvs/yast/trunk/branding/yast2-branding-openSUSE… ============================================================================== --- trunk/branding/yast2-branding-openSUSE.spec (original) +++ trunk/branding/yast2-branding-openSUSE.spec Mon Nov 3 12:54:07 2008 @@ -31,6 +31,7 @@ Provides: yast2-branding Conflicts: otherproviders(yast2-branding) Requires: yast2-theme-openSUSE-any +Requires: branding-openSUSE Summary: openSuSE branding for YaST %description -- 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] r52827 - /tags/stable-2_17_20/core/
by lslezak＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: lslezak Date: Mon Nov 3 12:01:00 2008 New Revision: 52827 URL: http://svn.opensuse.org/viewcvs/yast?rev=52827&view=rev Log: Created tag stable-2_17_20 for core Added: tags/stable-2_17_20/core/ - copied from r52826, trunk/core/ -- 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] r52826 - in /trunk/core: VERSION liby2dbus/src/PolKit.cc package/yast2-core.changes
by lslezak＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: lslezak Date: Mon Nov 3 12:00:55 2008 New Revision: 52826 URL: http://svn.opensuse.org/viewcvs/yast?rev=52826&view=rev Log: - fixed testing of the result of polkit_caller_new_from_dbus_name() call which sometime sets the error object even when there is no real error (bnc#439150) - 2.17.20 Modified: trunk/core/VERSION trunk/core/liby2dbus/src/PolKit.cc trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=52826&r1=52825&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Mon Nov 3 12:00:55 2008 @@ -1 +1 @@ -2.17.19 +2.17.20 Modified: trunk/core/liby2dbus/src/PolKit.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2dbus/src/PolKit.cc?rev… ============================================================================== --- trunk/core/liby2dbus/src/PolKit.cc (original) +++ trunk/core/liby2dbus/src/PolKit.cc Mon Nov 3 12:00:55 2008 @@ -25,11 +25,22 @@ y2debug("Checking action %s from %s", action_id.c_str(), dbus_caller.c_str()); PolKitCaller *pk_caller = polkit_caller_new_from_dbus_name(con, dbus_caller.c_str(), &dbus_error); + if (dbus_error_is_set (&dbus_error)) { - y2error ("dbus error: %s: %s", dbus_error.name, dbus_error.message); + // PolKit sometimes sets the error even if the PolKitCaller object has been successfully returned + // see bnc#439150 + if (pk_caller == NULL) + { + y2error ("dbus error: %s: %s", dbus_error.name, dbus_error.message); + } + dbus_error_free (&dbus_error); - return false; + + if (pk_caller == NULL) + { + return false; + } } if (pk_caller == NULL) Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Mon Nov 3 12:00:55 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Nov 3 11:55:50 CET 2008 - lslezak(a)suse.cz + +- fixed testing of the result of polkit_caller_new_from_dbus_name() + call which sometime sets the error object even when there is no + real error (bnc#439150) +- 2.17.20 + +------------------------------------------------------------------- Fri Oct 24 15:54:54 CEST 2008 - visnov(a)suse.cz - Also print diff when agent-process testsuite fails -- 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] r52825 - /trunk/slide-show/SuSELinux/slideshow.xml
by keichwa＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: keichwa Date: Mon Nov 3 11:48:21 2008 New Revision: 52825 URL: http://svn.opensuse.org/viewcvs/yast?rev=52825&view=rev Log: fix defects reported as bnc#439101 Modified: trunk/slide-show/SuSELinux/slideshow.xml Modified: trunk/slide-show/SuSELinux/slideshow.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/SuSELinux/slideshow.x… ============================================================================== --- trunk/slide-show/SuSELinux/slideshow.xml (original) +++ trunk/slide-show/SuSELinux/slideshow.xml Mon Nov 3 11:48:21 2008 @@ -156,11 +156,11 @@ <section label="10_devel"> <title>Virtualization Technology and Application Development Tools</title> - <para>The Xen hypervisor is included with openSUSE. Xen is one of the most -robust solutions for virtualization available. In addition, openSUSE -provides tools for network file sharing, printing (Samba) and Web hosting -(Apache). For application development, openSUSE comes with a complete -set of runtime environments plus extensive application development tools, + <para>The Xen hypervisor is included with openSUSE. Xen is one of the most +robust solutions for virtualization available. In addition, openSUSE provides +tools for network file sharing (Samba, NFS, etc.), printing (CUPS) and Web +hosting (Apache). For application development, openSUSE comes with a complete +set of runtime environments plus extensive application development tools, including KDevelop, Eclipse and Mono.</para> </section> @@ -170,7 +170,7 @@ <para> The openSUSE distribution provides extensive documentation for specific openSUSE questions as well as general Linux-related questions. The Help -Center is accessible via the main menu . Manuals are also available in +Center is accessible via the main menu. Manuals are also available in PDF and can be downloaded and printed  (http://en.opensuse.org/Documentation). @@ -188,7 +188,9 @@ www.opensuse.org </para> -<para>For support from other openSUSE users, visit the official openSUSE +<para> +For support from other openSUSE users, visit the official openSUSE forums at http://forums.opensuse.org/. Here you'll find thousands of other openSUSE users, eager to help you get everything you can out of Linux. If you're an experienced openSUSE user, the forums are a great place to meet -- 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] r52824 - /tags/stable-2_17_8/nfs-client/
by kmachalkova＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: kmachalkova Date: Mon Nov 3 10:43:54 2008 New Revision: 52824 URL: http://svn.opensuse.org/viewcvs/yast?rev=52824&view=rev Log: Created tag stable-2_17_8 for nfs-client Added: tags/stable-2_17_8/nfs-client/ - copied from r52823, trunk/nfs-client/ -- 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] r52823 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes
by kmachalkova＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: kmachalkova Date: Mon Nov 3 10:43:10 2008 New Revision: 52823 URL: http://svn.opensuse.org/viewcvs/yast?rev=52823&view=rev Log: version 2.17.8 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=52823&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Mon Nov 3 10:43:10 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Mon Nov 3 10:43:10 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Oct 31 16:45:29 CET 2008 - kmachalkova(a)suse.cz + +- Pass no data to the partitioner if the user decides to cancel + add/edit/delete NFS share operation +- Correct AY backwards compatibility code if 'vfstype' key is missing + on Import - assume plain nfs in that case (bnc#438497) +- 2.17.8 + +------------------------------------------------------------------- Wed Oct 29 18:12:10 CET 2008 - kmachalkova(a)suse.cz - Correct enabling/disabling of edit and delete buttons depending -- 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] r52822 - /trunk/product-creator/src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: jsuchome Date: Mon Nov 3 10:31:53 2008 New Revision: 52822 URL: http://svn.opensuse.org/viewcvs/yast?rev=52822&view=rev Log: report an error in case of package installation failure Modified: trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Mon Nov 3 10:31:53 2008 @@ -13,8 +13,9 @@ import "CWMTab"; import "Directory"; import "FileUtils"; - import "Label"; import "Kiwi"; + import "Label"; + import "Message"; import "Package"; import "PackageSystem"; import "Popup"; @@ -2369,6 +2370,7 @@ } if (to_install != "" && !Package::Install (to_install)) { + Popup::Error (Message::FailedToInstallPackages ()); continue; } } -- 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] r52821 - /trunk/gtk/src/ygtklinklabel.c
by rpmcruz＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: rpmcruz Date: Mon Nov 3 03:12:05 2008 New Revision: 52821 URL: http://svn.opensuse.org/viewcvs/yast?rev=52821&view=rev Log: Allocate always space for the open line. Modified: trunk/gtk/src/ygtklinklabel.c Modified: trunk/gtk/src/ygtklinklabel.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtklinklabel.c?rev=5282… ============================================================================== --- trunk/gtk/src/ygtklinklabel.c (original) +++ trunk/gtk/src/ygtklinklabel.c Mon Nov 3 03:12:05 2008 @@ -101,7 +101,8 @@ YGtkLinkLabel *label = YGTK_LINK_LABEL (widget); ygtk_link_label_ensure_layout (label); requisition->width = requisition->height = 0; - if (label->text && *label->text) { +// if (label->text && *label->text) + { PangoContext *context; PangoFontMetrics *metrics; gint ascent, descent; -- 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] r52820 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 02 Nov '08

02 Nov '08

Author: rpmcruz Date: Sun Nov 2 23:26:58 2008 New Revision: 52820 URL: http://svn.opensuse.org/viewcvs/yast?rev=52820&view=rev Log: * src/YGPackageSelector.cc (ListView): revert status tooltip for Language. * src/YGPackageSelector.cc: enableRepoMgr flag not totally honored... * src/YGPackageSelector.cc: wrap repositories items in the middle, and added a tooltip to them. Added tooltip text to the repo available versions combo box as well. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52820&r1=52819… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Nov 2 23:26:58 2008 @@ -2,6 +2,15 @@ * src/YGProgressBar.cc: got rid of ygtkprogressbar. + * src/YGPackageSelector.cc (ListView): revert status tooltip for + Language. + + * src/YGPackageSelector.cc: enableRepoMgr flag not totally honored... + + * src/YGPackageSelector.cc: wrap repositories items in the middle, and + added a tooltip to them. Added tooltip text to the repo available + versions combo box as well. + 2008-10-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (ListView): tooltip for status icon. Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Sun Nov 2 23:26:58 2008 @@ -541,11 +541,6 @@ GtkTreeIter iter; if (gtk_tree_view_get_tooltip_context (view, &x, &y, keyboard_mode, &model, &path, &iter)) { - GtkTreeViewColumn *column; - int bx, by; - gtk_tree_view_convert_widget_to_bin_window_coords (view, x, y, &bx, &by); - gtk_tree_view_get_path_at_pos (view, x, y, NULL, &column, NULL, NULL); - gtk_tree_view_set_tooltip_row (view, tooltip, path); gtk_tree_path_free (path); @@ -553,8 +548,47 @@ gtk_tree_model_get (model, &iter, YGtkZyppModel::PTR_COLUMN, &package, -1); if (!package) return FALSE; - if (package->type() == Ypp::Package::PATTERN_TYPE) { - gtk_tooltip_set_text (tooltip, package->description (true).c_str()); + if (package->type() == Ypp::Package::PACKAGE_TYPE) { + GtkTreeViewColumn *column; + int bx, by; + gtk_tree_view_convert_widget_to_bin_window_coords (view, x, y, &bx, &by); + gtk_tree_view_get_path_at_pos (view, x, y, NULL, &column, NULL, NULL); + if (column == gtk_tree_view_get_column (view, 0)) { + std::string status; + if (package->toInstall (NULL)) { + if (package->isInstalled()) + status = _("To re-install a different version"); + else + status = _("To install"); + } + else if (package->toRemove()) + status = _("To remove"); + else if (package->isInstalled()) { + status = _("Installed"); + if (package->hasUpgrade()) + status += _(" (upgrade available)"); + } + else + status = _("Not installed"); + if (package->isAuto()) + status += _("\nstatus changed by the dependency solver"); + if (package->isLocked()) + status += _("\nlocked: right-click to unlock"); + gtk_tooltip_set_markup (tooltip, status.c_str()); + GdkPixbuf *pixbuf = 0; + gtk_tree_model_get (model, &iter, + YGtkZyppModel::ICON_COLUMN, &pixbuf, -1); + if (pixbuf) { + gtk_tooltip_set_icon (tooltip, pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } + return TRUE; + } + } + else { + std::string text ("" + package->name() + "\n"); + text += package->description (true); + gtk_tooltip_set_markup (tooltip, text.c_str()); const std::string &icon = package->icon(); if (!icon.empty()) { GdkPixbuf *pixbuf = loadThemeIcon (icon.c_str(), 32); @@ -565,37 +599,6 @@ } return TRUE; } - else if (column == gtk_tree_view_get_column (view, 0)) { - std::string status; - if (package->toInstall (NULL)) { - if (package->isInstalled()) - status = _("To re-install a different version"); - else - status = _("To install"); - } - else if (package->toRemove()) - status = _("To remove"); - else if (package->isInstalled()) { - status = _("Installed"); - if (package->hasUpgrade()) - status += _(" (upgrade available)"); - } - else - status = _("Not installed"); - if (package->isAuto()) - status += _("\nstatus changed by the dependency solver"); - if (package->isLocked()) - status += _("\nlocked: right-click to unlock"); - gtk_tooltip_set_markup (tooltip, status.c_str()); - GdkPixbuf *pixbuf = 0; - gtk_tree_model_get (model, &iter, - YGtkZyppModel::ICON_COLUMN, &pixbuf, -1); - if (pixbuf) { - gtk_tooltip_set_icon (tooltip, pixbuf); - g_object_unref (G_OBJECT (pixbuf)); - } - return TRUE; - } } return FALSE; } @@ -1004,7 +1007,8 @@ // parent constructor should call build() } - void build (bool tree_mode, bool with_icons, bool multi_selection) + void build (bool tree_mode, bool with_icons, bool multi_selection, + bool do_tooltip) { if (m_view) gtk_container_remove (GTK_CONTAINER (m_scroll), m_view); @@ -1013,6 +1017,8 @@ GtkTreeView *view = GTK_TREE_VIEW (m_view); gtk_tree_view_set_headers_visible (view, FALSE); gtk_tree_view_set_search_column (view, TEXT_COL); + if (do_tooltip) + gtk_tree_view_set_tooltip_column (view, TEXT_COL); gtk_tree_view_set_show_expanders (view, tree_mode); GtkTreeViewColumn *column; @@ -1024,7 +1030,7 @@ gtk_tree_view_append_column (view, column); } renderer = gtk_cell_renderer_text_new(); - g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); + g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); column = gtk_tree_view_column_new_with_attributes ("", renderer, "markup", TEXT_COL, "sensitive", ENABLED_COL, NULL); gtk_tree_view_append_column (view, column); @@ -1139,7 +1145,7 @@ G_CALLBACK (rpm_groups_toggled_cb), this); gtk_box_pack_start (GTK_BOX (m_box), check, FALSE, TRUE, 0); } - build (m_rpmGroups, !m_rpmGroups, false); + build (m_rpmGroups, !m_rpmGroups, false, false); } virtual void doBuild (GtkTreeStore *store) @@ -1206,7 +1212,7 @@ static void rpm_groups_toggled_cb (GtkToggleButton *button, Categories *pThis) { pThis->m_rpmGroups = gtk_toggle_button_get_active (button); - pThis->build (pThis->m_rpmGroups, !pThis->m_rpmGroups, false); + pThis->build (pThis->m_rpmGroups, !pThis->m_rpmGroups, false, false); pThis->signalChanged(); } }; @@ -1217,21 +1223,24 @@ Repositories (Collections::Listener *listener, bool repoMgrEnabled) : StoreView (listener) { - GtkWidget *align, *button, *box, *image, *label; - image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); - label = gtk_label_new (_("Edit...")); - YGUtils::setWidgetFont (label, PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); - box = gtk_hbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); - button = gtk_button_new(); - gtk_container_add (GTK_CONTAINER (button), box); - align = gtk_alignment_new (0, 0, 0, 1); - gtk_container_add (GTK_CONTAINER (align), button); - g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (setup_button_clicked_cb), this); - gtk_box_pack_start (GTK_BOX (m_box), align, FALSE, TRUE, 0); - build (false, true, true); + if (repoMgrEnabled) { + GtkWidget *align, *button, *box, *image, *label; + image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU); + label = gtk_label_new (_("Edit...")); + YGUtils::setWidgetFont (label, PANGO_STYLE_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); + box = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (box), image, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); + button = gtk_button_new(); + gtk_container_add (GTK_CONTAINER (button), box); + gtk_widget_set_tooltip_text (button, _("Access the repositories manager tool.")); + align = gtk_alignment_new (0, 0, 0, 1); + gtk_container_add (GTK_CONTAINER (align), button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (setup_button_clicked_cb), this); + gtk_box_pack_start (GTK_BOX (m_box), align, FALSE, TRUE, 0); + } + build (false, true, true, true); } virtual ~Repositories() @@ -1959,7 +1968,7 @@ { if (pThis->m_packages.single()) { Ypp::Package *package = pThis->m_packages.front(); - int nb = gtk_combo_box_get_active (GTK_COMBO_BOX (pThis->m_available_versions)); + int nb = gtk_combo_box_get_active (combo); if (nb == -1) return; const Ypp::Package::Version *version; @@ -1976,6 +1985,12 @@ installLabel = _("Down_grade"); } gtk_button_set_label (GTK_BUTTON (pThis->m_install_button), installLabel); + + gchar *tooltip = g_strdup_printf ("%s (%s)\n%s", + version->number.c_str(), version->arch.c_str(), + version->repo ? version->repo->name.c_str() : "-repo error-"); + gtk_widget_set_tooltip_markup (GTK_WIDGET (combo), tooltip); + g_free (tooltip); } } Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5282… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Sun Nov 2 23:26:58 2008 @@ -1096,7 +1096,7 @@ virtual std::string description (bool rich) { - std::string text = m_locale.name() + " - " + m_locale.code(); + std::string text ("(" + m_locale.code() + ")"); int installed = 0, total = 0; for (GSList *i = getContainedPackages(); i; i = i->next) { ZyppSelectablePtr sel = (ZyppSelectablePtr) i->data; -- 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] r52819 - /trunk/gtk/src/ygtkfindentry.c
by rpmcruz＠svn.opensuse.org 02 Nov '08

02 Nov '08

Author: rpmcruz Date: Sun Nov 2 03:19:42 2008 New Revision: 52819 URL: http://svn.opensuse.org/viewcvs/yast?rev=52819&view=rev Log: Increased timeout. Modified: trunk/gtk/src/ygtkfindentry.c Modified: trunk/gtk/src/ygtkfindentry.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.c?rev=5281… ============================================================================== --- trunk/gtk/src/ygtkfindentry.c (original) +++ trunk/gtk/src/ygtkfindentry.c Sun Nov 2 03:19:42 2008 @@ -502,7 +502,7 @@ } } -#define INSERT_COMPLETION_TIMEOUT 1000 +#define INSERT_COMPLETION_TIMEOUT 2000 static gboolean completion_timeout_cb (void *pdata) { -- 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] r52818 - /trunk/gtk/src/ygtkfindentry.c
by rpmcruz＠svn.opensuse.org 02 Nov '08

02 Nov '08

Author: rpmcruz Date: Sun Nov 2 02:34:19 2008 New Revision: 52818 URL: http://svn.opensuse.org/viewcvs/yast?rev=52818&view=rev Log: Increased find entry completion timeout. Modified: trunk/gtk/src/ygtkfindentry.c Modified: trunk/gtk/src/ygtkfindentry.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.c?rev=5281… ============================================================================== --- trunk/gtk/src/ygtkfindentry.c (original) +++ trunk/gtk/src/ygtkfindentry.c Sun Nov 2 02:34:19 2008 @@ -502,7 +502,7 @@ } } -#define INSERT_COMPLETION_TIMOUT 500 +#define INSERT_COMPLETION_TIMEOUT 1000 static gboolean completion_timeout_cb (void *pdata) { @@ -532,7 +532,7 @@ } if (fentry->completion_timer_id) g_source_remove (fentry->completion_timer_id); - fentry->completion_timer_id = g_timeout_add (INSERT_COMPLETION_TIMOUT, + fentry->completion_timer_id = g_timeout_add (INSERT_COMPLETION_TIMEOUT, completion_timeout_cb, fentry); } -- 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] r52817 - in /trunk/gtk/src: YGPackageSelector.cc YGProgressBar.cc
by rpmcruz＠svn.opensuse.org 02 Nov '08

02 Nov '08

Author: rpmcruz Date: Sun Nov 2 02:25:27 2008 New Revision: 52817 URL: http://svn.opensuse.org/viewcvs/yast?rev=52817&view=rev Log: Forgot header. Reduced changes width. Modified: trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGProgressBar.cc Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Sun Nov 2 02:25:27 2008 @@ -875,7 +875,7 @@ ygtk_wizard_set_information_expose_hook (vbox, &vbox->allocation); ygtk_wizard_set_information_expose_hook (m_entries_box, &m_entries_box->allocation); - int width = YGUtils::getCharsWidth (vbox, 35); + int width = YGUtils::getCharsWidth (vbox, 32); gtk_widget_set_size_request (vbox, width, -1); gtk_widget_show_all (vbox); Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=528… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Sun Nov 2 02:25:27 2008 @@ -10,7 +10,6 @@ #include <YGUI.h> #include "YGWidget.h" #include "YGi18n.h" -#include "ygtkprogressbar.h" #include "YProgressBar.h" -- 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] r52816 - in /trunk/gtk: ChangeLog src/Makefile.am src/YGDialog.cc src/YGDialog.h src/YGProgressBar.cc src/ygtkprogressbar.c src/ygtkprogressbar.h
by rpmcruz＠svn.opensuse.org 02 Nov '08

02 Nov '08

Author: rpmcruz Date: Sun Nov 2 01:15:21 2008 New Revision: 52816 URL: http://svn.opensuse.org/viewcvs/yast?rev=52816&view=rev Log: * src/YGProgressBar.cc: got rid of ygtkprogressbar. Removed: trunk/gtk/src/ygtkprogressbar.c trunk/gtk/src/ygtkprogressbar.h Modified: trunk/gtk/ChangeLog trunk/gtk/src/Makefile.am trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGProgressBar.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52816&r1=52815… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Nov 2 01:15:21 2008 @@ -1,3 +1,7 @@ +2008-11-02 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGProgressBar.cc: got rid of ygtkprogressbar. + 2008-10-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGPackageSelector.cc (ListView): tooltip for status icon. Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=52816&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Sun Nov 2 01:15:21 2008 @@ -66,7 +66,6 @@ ygtktimezonepicker.c \ ygtkhandlebox.c \ ygtklinklabel.c \ - ygtkprogressbar.c \ ygtktooltip.c \ ygtkrichtext.c \ yzyppwrapper.cc \ Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=52816&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Sun Nov 2 01:15:21 2008 @@ -361,6 +361,11 @@ m_window->setChild (this); } +void YGDialog::present() +{ + gtk_window_present (GTK_WINDOW (m_window->getWidget())); +} + YGDialog *YGDialog::currentDialog() { YDialog *ydialog = YDialog::currentDialog (false); @@ -527,6 +532,7 @@ g_free (str); m_stickyTitle = sticky; } + present(); } void YGDialog::setIcon (const std::string &icon) Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=52816&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Sun Nov 2 01:15:21 2008 @@ -34,6 +34,7 @@ virtual void openInternal(); virtual void activate(); + void present(); virtual YEvent *waitForEventInternal (int timeout_millisec); virtual YEvent *pollEventInternal(); Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=528… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Sun Nov 2 01:15:21 2008 @@ -22,8 +22,7 @@ // NOTE: its label widget is positionated at the vertical, because its label // may change often and so will its size, which will look odd (we may want // to make the label widget to only grow). - , YGLabeledWidget (this, parent, label, YD_VERT, true, - YGTK_TYPE_PROGRESS_BAR, NULL) + , YGLabeledWidget (this, parent, label, YD_VERT, true, GTK_TYPE_PROGRESS_BAR, NULL) {} // YProgressBar @@ -31,9 +30,9 @@ { IMPL YProgressBar::setValue (value); - YGtkProgressBar *bar = YGTK_PROGRESS_BAR (getWidget()); + GtkProgressBar *bar = GTK_PROGRESS_BAR (getWidget()); float fraction = CLAMP ((float) value / maxValue(), 0, 1); - ygtk_progress_bar_set_fraction (bar, fraction); + gtk_progress_bar_set_fraction (bar, fraction); /* char *text = g_strdup_printf ("%d %%", (int) (fraction*100)); gtk_progress_bar_set_text (bar, text); @@ -150,9 +149,7 @@ { ygtk_ratio_box_set_spacing (YGTK_RATIO_BOX (getWidget()), 2); for (int s = 0; s < segments(); s++) { - GtkWidget* bar = ygtk_progress_bar_new(); - if (segments() > 1) - ygtk_progress_bar_disable_continuous (YGTK_PROGRESS_BAR (bar)); + GtkWidget *bar = gtk_progress_bar_new(); gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR (bar), horizontal() ? GTK_PROGRESS_LEFT_TO_RIGHT : GTK_PROGRESS_BOTTOM_TO_TOP); // Progress bars would ask for too much size with weight... @@ -174,8 +171,8 @@ GList* children = gtk_container_get_children (GTK_CONTAINER (getWidget())); int s = 0; for (GList *i = children; i && s < segments(); i = i->next, s++) { - YGtkProgressBar *bar = YGTK_PROGRESS_BAR (i->data); - ygtk_progress_bar_set_fraction (bar, getSegmentValue (s)); + GtkProgressBar *bar = GTK_PROGRESS_BAR (i->data); + gtk_progress_bar_set_fraction (bar, getSegmentValue (s)); } g_list_free (children); } @@ -210,8 +207,8 @@ until timeout is reached. The application will ping setAlive(true) calls -- and we reset the timeout -- as an indication that the program hasn't hang in some operation. */ -#define PULSE_INTERVAL 80 -#define PULSE_STEP 0.040 +#define PULSE_INTERVAL 100 +#define PULSE_STEP 0.050 class YGBusyIndicator : public YBusyIndicator, public YGLabeledWidget { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0