September 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r51639 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQDialog.cc src/YQUI.cc src/YQUI.h src/YQWizard.cc src/YQWizard.h yast2-qt.spec.in
by tgoettlicher＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: tgoettlicher Date: Mon Sep 29 14:40:34 2008 New Revision: 51639 URL: http://svn.opensuse.org/viewcvs/yast?rev=51639&view=rev Log: Fixed bnc #418443: Yast modules windows have no title Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQDialog.cc trunk/qt/src/YQUI.cc trunk/qt/src/YQUI.h trunk/qt/src/YQWizard.cc trunk/qt/src/YQWizard.h trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=51639&r1=51… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Mon Sep 29 14:40:34 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "10") +SET(VERSION_PATCH "12") 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 Mon Sep 29 14:40:34 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 26 15:52:16 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.12 + +------------------------------------------------------------------- Wed Sep 24 18:32:11 CEST 2008 - sh(a)suse.de - Improved robustness against already-deleted widgets (bnc #421794) Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=51639&r1=… ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Mon Sep 29 14:40:34 2008 @@ -81,6 +81,8 @@ setPalette( warnPalette ); } + setWindowTitle( YQUI::ui()->applicationTitle() ); + if ( isMainDialog() && QWidget::parent() != YQMainWinDock::mainWinDock() ) { setWindowFlags( YQPopupDialogWFlags ); Modified: trunk/qt/src/YQUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI.cc?rev=51639&r1=5163… ============================================================================== --- trunk/qt/src/YQUI.cc (original) +++ trunk/qt/src/YQUI.cc Mon Sep 29 14:40:34 2008 @@ -185,26 +185,40 @@ #endif - // Set window title + // + // Set application title (used by YQDialog and YQWizard) + // - QString title( fromUTF8( progName ) ); - char hostname[ MAXHOSTNAMELEN+1 ]; + // for YaST2, display "YaST2" instead of "y2base" + if ( progName == "y2base" ) + _applicationTitle = QString( "YaST2" ); + else + _applicationTitle = fromUTF8( progName ); + + // read x11 display from commandline or environment variable + int displayArgPos = cmdLine.find( "-display" ); + QString displayName; + if ( displayArgPos > 0 && displayArgPos+1 < cmdLine.argc() ) + displayName = cmdLine[ displayArgPos+1 ].c_str(); + else + displayName = getenv( "DISPLAY" ); + + // identify hostname + char hostname[ MAXHOSTNAMELEN+1 ]; if ( gethostname( hostname, sizeof( hostname )-1 ) == 0 ) - { hostname[ sizeof( hostname ) -1 ] = '\0'; // make sure it's terminated + else + hostname[0] = '\0'; - if ( strlen( hostname ) > 0 ) - { - if ( ( strcmp( hostname, "(none)" ) != 0 && - strcmp( hostname, "linux" ) != 0 ) ) - { - title += "@"; - title += hostname; - } - } + // add hostname to the window title if it's not a local display + if ( !displayName.startsWith( ":" ) && strlen( hostname ) > 0 ) + { + _applicationTitle += QString( "@" ); + _applicationTitle += fromUTF8( hostname ); } + #if 0 // Hide the main window for now. The first call to UI::OpenDialog() on an // `opt(`defaultSize) dialog will trigger a dialog->open() call that shows @@ -669,8 +683,6 @@ - - YQUISignalReceiver::YQUISignalReceiver() : QObject() { Modified: trunk/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI.h?rev=51639&r1=51638… ============================================================================== --- trunk/qt/src/YQUI.h (original) +++ trunk/qt/src/YQUI.h Mon Sep 29 14:40:34 2008 @@ -281,6 +281,10 @@ **/ bool usingVisionImpairedPalette() const { return _usingVisionImpairedPalette; } + /** + * Returns the application name for the window title (e.g. "YaST2@hostname") + **/ + QString applicationTitle() { return _applicationTitle; } protected: @@ -352,6 +356,7 @@ QY2Styler * _styler; YQUISignalReceiver * _signalReceiver; + QString _applicationTitle; // Qt copies the _reference_ to argc, so we need to store argc int _ui_argc; Modified: trunk/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=51639&r1=… ============================================================================== --- trunk/qt/src/YQWizard.cc (original) +++ trunk/qt/src/YQWizard.cc Mon Sep 29 14:40:34 2008 @@ -133,6 +133,8 @@ //layoutTitleBar( this ); + topLevelWidget()->setWindowTitle( YQUI::ui()->applicationTitle() ); + layout->addLayout( layoutSideBar( this ) ); layout->addWidget( layoutWorkArea( this ) ); @@ -855,6 +857,17 @@ } +void YQWizard::setDialogTitle( const string & titleText ) +{ + QString title = fromUTF8( titleText.c_str() ); + + if ( !title.isEmpty() ) + topLevelWidget()->setWindowTitle( YQUI::ui()->applicationTitle() + QString(" - ") + title ); + else + topLevelWidget()->setWindowTitle( YQUI::ui()->applicationTitle() ); +} + + void YQWizard::setDialogHeading( const string & headingText ) { if ( _dialogHeading ) Modified: trunk/qt/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.h?rev=51639&r1=5… ============================================================================== --- trunk/qt/src/YQWizard.h (original) +++ trunk/qt/src/YQWizard.h Mon Sep 29 14:40:34 2008 @@ -128,6 +128,15 @@ virtual void setDialogIcon( const string & iconName ); /** + * Set the dialog title shown in window manager's title bar. + * An empty string clears the current text. + * + * Implemented from YWizard. + **/ + virtual void setDialogTitle( const string & titleText ); + + + /** * Set the dialog heading. * * Implemented from YWizard. Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=51639&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Mon Sep 29 14:40:34 2008 @@ -16,8 +16,8 @@ Summary: - BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-libyui-devel >= 2.17.11 -Requires: yast2-libyui >= 2.17.11 +BuildRequires: yast2-libyui-devel >= 2.17.12 +Requires: yast2-libyui >= 2.17.12 Requires: yast2_theme >= 2.16.1 Provides: yast2_ui Provides: y2base:/usr/lib/YaST2/servers/qt -- 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] r51638 - /tags/stable-2_17_8/ycp-ui-bindings/
by tgoettlicher＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: tgoettlicher Date: Mon Sep 29 14:40:04 2008 New Revision: 51638 URL: http://svn.opensuse.org/viewcvs/yast?rev=51638&view=rev Log: Created tag stable-2_17_8 for ycp-ui-bindings Added: tags/stable-2_17_8/ycp-ui-bindings/ - copied from r51637, trunk/ycp-ui-bindings/ -- 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] r51637 - in /trunk/ycp-ui-bindings: VERSION package/yast2-ycp-ui-bindings.changes src/YCPWizardCommandParser.cc yast2-ycp-ui-bindings.spec.in
by tgoettlicher＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: tgoettlicher Date: Mon Sep 29 14:39:56 2008 New Revision: 51637 URL: http://svn.opensuse.org/viewcvs/yast?rev=51637&view=rev Log: Fixed bnc #418443: Yast modules windows have no title Modified: trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Modified: trunk/ycp-ui-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=5163… ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Mon Sep 29 14:39:56 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/package/yast2-yc… ============================================================================== --- trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes (original) +++ trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes Mon Sep 29 14:39:56 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 26 15:54:34 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.8 + +------------------------------------------------------------------- Thu Sep 25 11:58:30 CEST 2008 - sh(a)suse.de - Require latest libyui (API change!) Modified: trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPWizardCom… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPWizardCommandParser.cc Mon Sep 29 14:39:56 2008 @@ -31,6 +31,7 @@ { if ( isCommand( "SetHelpText ( string )", cmd ) ) { wizard->setHelpText ( stringArg( cmd, 0 ) ); return true; } if ( isCommand( "SetDialogIcon ( string )", cmd ) ) { wizard->setDialogIcon ( stringArg( cmd, 0 ) ); return true; } + if ( isCommand( "SetDialogTitle ( string )", cmd ) ) { wizard->setDialogTitle( stringArg( cmd, 0 ) ); return true; } if ( isCommand( "SetDialogHeading ( string )", cmd ) ) { wizard->setDialogHeading( stringArg( cmd, 0 ) ); return true; } if ( isCommand( "SetCurrentStep ( string )", cmd ) ) { wizard->setCurrentStep( stringArg( cmd, 0 ) ); return true; } Modified: trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/yast2-ycp-ui-bin… ============================================================================== --- trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in (original) +++ trunk/ycp-ui-bindings/yast2-ycp-ui-bindings.spec.in Mon Sep 29 14:39:56 2008 @@ -19,8 +19,8 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.17.11 -BuildRequires: yast2-libyui-devel >= 2.17.11 +Requires: yast2-libyui >= 2.17.12 +BuildRequires: yast2-libyui-devel >= 2.17.12 # libyui ImplPtr BuildRequires: boost-devel -- 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] r51636 - /tags/stable-2_17_12/libyui/
by tgoettlicher＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: tgoettlicher Date: Mon Sep 29 14:39:28 2008 New Revision: 51636 URL: http://svn.opensuse.org/viewcvs/yast?rev=51636&view=rev Log: Created tag stable-2_17_12 for libyui Added: tags/stable-2_17_12/libyui/ - copied from r51635, trunk/libyui/ -- 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] r51635 - in /trunk/libyui: VERSION package/yast2-libyui.changes src/YWizard.h
by tgoettlicher＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: tgoettlicher Date: Mon Sep 29 14:39:17 2008 New Revision: 51635 URL: http://svn.opensuse.org/viewcvs/yast?rev=51635&view=rev Log: Fixed bnc #418443: Yast modules windows have no title Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/YWizard.h Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=51635&r1=5163… ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Mon Sep 29 14:39:17 2008 @@ -1 +1 @@ -2.17.11 +2.17.12 Modified: trunk/libyui/package/yast2-libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/package/yast2-libyui.chan… ============================================================================== --- trunk/libyui/package/yast2-libyui.changes (original) +++ trunk/libyui/package/yast2-libyui.changes Mon Sep 29 14:39:17 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 26 15:41:16 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #418443: Yast modules windows have no title +- V 2.17.12 + +------------------------------------------------------------------- Wed Sep 24 18:26:06 CEST 2008 - sh(a)suse.de - Improved robustness against already-deleted widgets (bnc #421794) Modified: trunk/libyui/src/YWizard.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YWizard.h?rev=51635&r… ============================================================================== --- trunk/libyui/src/YWizard.h (original) +++ trunk/libyui/src/YWizard.h Mon Sep 29 14:39:17 2008 @@ -167,6 +167,12 @@ virtual void setDialogIcon( const string & iconName ) = 0; /** + * Set the dialog title shown in the window manager's title bar. + An empty string clears the current title. + **/ + virtual void setDialogTitle( const string & titleText ) = 0; + + /** * Set the dialog heading. **/ virtual void setDialogHeading( const string & headingText ) = 0; -- 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] r51634 - /tags/stable-2_17_8/ldap-server/
by rhafer＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: rhafer Date: Mon Sep 29 14:38:31 2008 New Revision: 51634 URL: http://svn.opensuse.org/viewcvs/yast?rev=51634&view=rev Log: Created tag stable-2_17_8 for ldap-server Added: tags/stable-2_17_8/ldap-server/ - copied from r51633, trunk/ldap-server/ -- 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] r51633 - in /trunk/installation: control/control.SLED.xml control/control.SLES.xml control/control.openSUSE.xml package/yast2-installation.changes
by locilka＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: locilka Date: Mon Sep 29 13:38:34 2008 New Revision: 51633 URL: http://svn.opensuse.org/viewcvs/yast?rev=51633&view=rev Log: - Adding inst_lilo_convert to the update workflow (bnc #430579). Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Mon Sep 29 13:38:34 2008 @@ -566,6 +566,11 @@ <label>Update</label> </module> <module> + <label>Update Summary</label> + <name>lilo_convert</name> + <execute>inst_lilo_convert</execute> + </module> + <module> <label>Update Summary</label> <name>inital_update_proposal</name> <execute>inst_proposal</execute> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Mon Sep 29 13:38:34 2008 @@ -670,6 +670,11 @@ <label>Update</label> </module> <module> + <label>Update Summary</label> + <name>lilo_convert</name> + <execute>inst_lilo_convert</execute> + </module> + <module> <label>Update Summary</label> <name>initial_update_proposal</name> <execute>inst_proposal</execute> Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Sep 29 13:38:34 2008 @@ -843,6 +843,11 @@ <heading>yes</heading> <label>Update</label> </module> + <module> + <label>Update Settings</label> + <name>lilo_convert</name> + <execute>inst_lilo_convert</execute> + </module> <module> <label>Update Settings</label> <name>initial_update_proposal</name> 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 Sep 29 13:38:34 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 29 13:38:13 CEST 2008 - locilka(a)suse.cz + +- Adding inst_lilo_convert to the update workflow (bnc #430579). + +------------------------------------------------------------------- Fri Sep 26 12:27:55 CEST 2008 - locilka(a)suse.cz - Optimizing server_selections dialog layout (bnc #429977). -- 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] r51632 - in /trunk/gtk: ./ src/ tests/
by rpmcruz＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: rpmcruz Date: Mon Sep 29 13:38:30 2008 New Revision: 51632 URL: http://svn.opensuse.org/viewcvs/yast?rev=51632&view=rev Log: * src/ygtkfindentry.h/c: added support embed context menu which pairs the find icon to the menu item. * src/YGPackageSelector.cc: changed find entry check-based menu popup to a criteria choice one. * src/ygtkfindentry.c: added auto-completion support. * src/ygtkprogressbar.h/c: makes progress bar a bit smoother. Just using the last change as guide with some liberal tweaks. * src/YGProgressBar.cc (YGProgressBar): use ygtkprogressbar * src/YGProgressBar.cc (YGBusyIndicator): use pulse-step to make it smoother. * src/YGProgressBar.cc (YGDownloadProgress): show download size in the progress bar. Added: trunk/gtk/src/ygtkprogressbar.c trunk/gtk/src/ygtkprogressbar.h trunk/gtk/tests/ProgressBar.ycp Removed: trunk/gtk/tests/ProgressPulse.ycp Modified: trunk/gtk/ChangeLog trunk/gtk/src/Makefile.am trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGProgressBar.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGWidget.h trunk/gtk/src/ygtkbargraph.c trunk/gtk/src/ygtkfieldentry.c trunk/gtk/src/ygtkfindentry.c trunk/gtk/src/ygtkfindentry.h trunk/gtk/src/ygtkhandlebox.h trunk/gtk/src/ygtklinklabel.c trunk/gtk/src/ygtkmenubutton.c trunk/gtk/src/ygtkrichtext.c trunk/gtk/src/ygtktimezonepicker.c trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=51632&r1=51631… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Sep 29 13:38:30 2008 @@ -1,3 +1,22 @@ +2008-09-28 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkfindentry.h/c: added support embed context menu which pairs + the find icon to the menu item. + + * src/YGPackageSelector.cc: changed find entry check-based menu popup + to a criteria choice one. + + * src/ygtkfindentry.c: added auto-completion support. + + * src/ygtkprogressbar.h/c: makes progress bar a bit smoother. Just + using the last change as guide with some liberal tweaks. + + * src/YGProgressBar.cc (YGProgressBar): use ygtkprogressbar + * src/YGProgressBar.cc (YGBusyIndicator): use pulse-step to make it + smoother. + * src/YGProgressBar.cc (YGDownloadProgress): show download size in + the progress bar. + 2008-09-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGWidget.cc: bug fix 421794: clean any emitted event when Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=51632&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Mon Sep 29 13:38:30 2008 @@ -56,10 +56,11 @@ ygtktimezonepicker.c \ ygtkhandlebox.c \ ygtklinklabel.c \ + ygtkprogressbar.c \ + ygtkrichtext.c \ yzyppwrapper.cc \ yzypptags.cc \ - ygtkzyppwrapper.cc \ - ygtkrichtext.c + ygtkzyppwrapper.cc # should only append ygtkrichtext.c if USE_GTKHTML is set dummy_SOURCES = dummy.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 Mon Sep 29 13:38:30 2008 @@ -1457,31 +1457,20 @@ gtk_widget_set_tooltip_markup (m_name, _("Package search: Use spaces to separate your keywords. They " "will be matched against RPM name and summary attributes. " - "Further attributes can be included in the criteria by pressing the search icon.\n" + "Other criteria attributes are available by pressing the search icon.\n" "(usage example: \"yast dhcp\" will return yast's dhcpd tool)")); g_signal_connect (G_OBJECT (m_name), "changed", G_CALLBACK (name_changed_cb), this); - - struct inner { - static void appendCheckItem (GtkWidget *menu, const char *str, bool active, - Filters *pThis) - { - GtkWidget *item = gtk_check_menu_item_new_with_label (str); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), active); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - g_signal_connect (G_OBJECT (item), "toggled", - G_CALLBACK (name_changed_cb), pThis); - } - }; - - GtkWidget *name_menu = gtk_menu_new(); - inner::appendCheckItem (name_menu, _("Name"), true, this); - inner::appendCheckItem (name_menu, _("Summary"), true, this); - inner::appendCheckItem (name_menu, _("Description"), false, this); - inner::appendCheckItem (name_menu, _("File list"), false, this); - inner::appendCheckItem (name_menu, _("Authors"), false, this); - gtk_widget_show_all (name_menu); - ygtk_find_entry_attach_menu (YGTK_FIND_ENTRY (m_name), GTK_MENU (name_menu)); + ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by name & summary"), + GTK_STOCK_FIND); + ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by description"), + GTK_STOCK_EDIT); + ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by file"), + GTK_STOCK_OPEN); + ygtk_find_entry_insert_item (YGTK_FIND_ENTRY (m_name), _("Filter by author"), + GTK_STOCK_ABOUT); + g_signal_connect (G_OBJECT (m_name), "menu-item-selected", + G_CALLBACK (name_item_changed_cb), this); m_type = gtk_combo_box_new_text(); if (updateMode) @@ -1516,7 +1505,9 @@ pThis->signalChangedDelay(); } - static void name_changed_cb (gpointer widget, Filters *pThis) + static void name_changed_cb (YGtkFindEntry *entry, Filters *pThis) + { pThis->m_nameChanged = true; pThis->signalChangedDelay(); } + static void name_item_changed_cb (gpointer widget, gint nb, Filters *pThis) { pThis->m_nameChanged = true; pThis->signalChangedDelay(); } static void field_changed_cb (gpointer widget, Filters *pThis) { pThis->signalChangedDelay(); } @@ -1547,20 +1538,24 @@ const char *name = gtk_entry_get_text (GTK_ENTRY (m_name)); if (*name) { + gint item = ygtk_find_entry_get_selected_item (YGTK_FIND_ENTRY (m_name)); bool use_name, use_summary, use_description, use_filelist, use_authors; - GtkMenu *name_menu = YGTK_FIND_ENTRY (m_name)->context_menu; - GList *items = gtk_container_get_children (GTK_CONTAINER (name_menu)); - use_name = gtk_check_menu_item_get_active ( - (GtkCheckMenuItem *) g_list_nth_data (items, 0)); - use_summary = gtk_check_menu_item_get_active ( - (GtkCheckMenuItem *) g_list_nth_data (items, 1)); - use_description = gtk_check_menu_item_get_active ( - (GtkCheckMenuItem *) g_list_nth_data (items, 2)); - use_filelist = gtk_check_menu_item_get_active ( - (GtkCheckMenuItem *) g_list_nth_data (items, 3)); - use_authors = gtk_check_menu_item_get_active ( - (GtkCheckMenuItem *) g_list_nth_data (items, 4)); - g_list_free (items); + use_name = use_summary = use_description = use_filelist = use_authors = false; + switch (item) { + case 0: // name & summary + default: + use_name = use_summary = true; + break; + case 1: // description + use_name = use_summary = use_description = true; + break; + case 2: // file + use_filelist = true; + break; + case 3: // author + use_authors = true; + break; + } query->addNames (name, ' ', use_name, use_summary, use_description, use_filelist, use_authors); } Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=516… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Mon Sep 29 13:38:30 2008 @@ -2,9 +2,15 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ +/* + Textdomain "yast2-gtk" + */ + #include <config.h> #include <YGUI.h> #include "YGWidget.h" +#include "YGi18n.h" +#include "ygtkprogressbar.h" #include "YProgressBar.h" @@ -17,7 +23,7 @@ // 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, - GTK_TYPE_PROGRESS_BAR, NULL) + YGTK_TYPE_PROGRESS_BAR, NULL) {} // YProgressBar @@ -25,11 +31,11 @@ { IMPL YProgressBar::setValue (value); - GtkProgressBar *bar = GTK_PROGRESS_BAR (getWidget()); + YGtkProgressBar *bar = YGTK_PROGRESS_BAR (getWidget()); float fraction = CLAMP ((float) value / maxValue(), 0, 1); - gtk_progress_bar_set_fraction (bar, fraction); + ygtk_progress_bar_set_fraction (bar, fraction); /* - char *text = g_strdup_printf ("%d%%", (int) (fraction*100)); + char *text = g_strdup_printf ("%d %%", (int) (fraction*100)); gtk_progress_bar_set_text (bar, text); g_free (text); */ @@ -76,9 +82,44 @@ static gboolean timeout_cb (void *pData) { YGDownloadProgress *pThis = (YGDownloadProgress*) pData; - float fraction = ((float) pThis->currentFileSize()) / pThis->expectedSize(); - if (fraction > 1) fraction = 1; - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (pThis->getWidget()), fraction); + GtkProgressBar *bar = GTK_PROGRESS_BAR (pThis->getWidget()); + + double current, total; + int unit = 0; + for (current = pThis->currentFileSize(), total = pThis->expectedSize(); total/1024>1; unit++) { + current /= 1024; + total /= 1024; + } + float fraction = 0; + if (total) + fraction = MIN ((float) current / total, 1); + + gtk_progress_bar_set_fraction (bar, fraction); + const char *unit_str; + switch (unit) { + case 0: + unit_str = "B"; + break; + case 1: + unit_str = "KB"; + break; + case 2: + unit_str = "MB"; + break; + case 3: + unit_str = "GB"; + break; + default: + unit_str = ""; + break; + } + char *text; + if (total) + text = g_strdup_printf ("%.1f %s %s %.1f %s", current, unit_str, _("of"), total, unit_str); + else + text = g_strdup_printf ("%.1f %s", current, unit_str); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), text); + g_free (text); return TRUE; } @@ -99,14 +140,16 @@ class YGMultiProgressMeter : public YMultiProgressMeter, public YGWidget { public: - YGMultiProgressMeter (YWidget *parent, YUIDimension dim, const vector<float> &maxValues) + YGMultiProgressMeter (YWidget *parent, YUIDimension dim, const vector <float> &maxValues) : YMultiProgressMeter (NULL, dim, maxValues) , YGWidget (this, parent, true, horizontal() ? YGTK_TYPE_RATIO_HBOX : YGTK_TYPE_RATIO_VBOX, NULL) { ygtk_ratio_box_set_spacing (YGTK_RATIO_BOX (getWidget()), 2); for (int s = 0; s < segments(); s++) { - GtkWidget* bar = gtk_progress_bar_new(); + GtkWidget* bar = ygtk_progress_bar_new(); + if (segments() > 1) + ygtk_progress_bar_disable_continuous (YGTK_PROGRESS_BAR (bar)); 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... @@ -128,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++) { - GtkProgressBar *bar = GTK_PROGRESS_BAR (i->data); - gtk_progress_bar_set_fraction (bar, getSegmentValue (s)); + YGtkProgressBar *bar = YGTK_PROGRESS_BAR (i->data); + ygtk_progress_bar_set_fraction (bar, getSegmentValue (s)); } g_list_free (children); } @@ -164,7 +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 150 +#define PULSE_INTERVAL 80 +#define PULSE_STEP 0.040 class YGBusyIndicator : public YBusyIndicator, public YGLabeledWidget { @@ -174,7 +218,8 @@ public: YGBusyIndicator (YWidget *parent, const string &label, int timeout) : YBusyIndicator (NULL, label, timeout) - , YGLabeledWidget (this, parent, label, YD_VERT, true, GTK_TYPE_PROGRESS_BAR, NULL) + , YGLabeledWidget (this, parent, label, YD_VERT, true, + GTK_TYPE_PROGRESS_BAR, "pulse-step", PULSE_STEP, NULL) { pulse_timeout_id = 0; pulse(); Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=51632&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Mon Sep 29 13:38:30 2008 @@ -550,3 +550,38 @@ const char *fallbackIcon) { return YGUtils::setStockIcon (button, label, fallbackIcon); } +/* interactive busy cursor */ +// half cursor, half clock cursor is not a Xlib theme icon, but there is +// a hack to load it like: (if we ever want to use it...) +#if 0 +__LEFT_PTR_WATCH = None +def set_busy_cursor (window): + global __LEFT_PTR_WATCH + if __LEFT_PTR_WATCH is None: + os.environ['XCURSOR_DISCOVER'] = '1' #Turn on logging in Xlib + # Busy cursor code from Padraig Brady <P(a)draigBrady.com> + # cursor_data hash is 08e8e1c95fe2fc01f976f1e063a24ccd + cursor_data = "\ +\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\ +\x0c\x00\x00\x00\x1c\x00\x00\x00\x3c\x00\x00\x00\ +\x7c\x00\x00\x00\xfc\x00\x00\x00\xfc\x01\x00\x00\ +\xfc\x3b\x00\x00\x7c\x38\x00\x00\x6c\x54\x00\x00\ +\xc4\xdc\x00\x00\xc0\x44\x00\x00\x80\x39\x00\x00\ +\x80\x39\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\ +\x00\x00\x00\x00\x00\x00\x00\x00" + + try: + pix = gtk.gdk.bitmap_create_from_data(None, cursor_data, 32, 32) + color = gtk.gdk.Color() + __LEFT_PTR_WATCH = gtk.gdk.Cursor(pix, pix, color, color, 2, 2) + except TypeError: + # old bug http://bugzilla.gnome.org/show_bug.cgi?id=103616 + # default "WATCH" cursor + __LEFT_PTR_WATCH = gtk.gdk.Cursor(gtk.gdk.WATCH) + window.set_cursor (__LEFT_PTR_WATCH) +#endif + Modified: trunk/gtk/src/YGWidget.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.h?rev=51632&r1=… ============================================================================== --- trunk/gtk/src/YGWidget.h (original) +++ trunk/gtk/src/YGWidget.h Mon Sep 29 13:38:30 2008 @@ -125,8 +125,8 @@ #define YGLABEL_WIDGET_IMPL_SET_LABEL_CHAIN(ParentClass) \ virtual void setLabel (const std::string &label) { \ IMPL \ - doSetLabel (label); \ ParentClass::setLabel (label); \ + doSetLabel (label); \ } /* This is a convenience class for widgets that need scrollbars. */ Modified: trunk/gtk/src/ygtkbargraph.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkbargraph.c?rev=51632… ============================================================================== --- trunk/gtk/src/ygtkbargraph.c (original) +++ trunk/gtk/src/ygtkbargraph.c Mon Sep 29 13:38:30 2008 @@ -194,3 +194,4 @@ GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); widget_class->expose_event = ygtk_colored_label_expose_event; } + Modified: trunk/gtk/src/ygtkfieldentry.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfieldentry.c?rev=516… ============================================================================== --- trunk/gtk/src/ygtkfieldentry.c (original) +++ trunk/gtk/src/ygtkfieldentry.c Mon Sep 29 13:38:30 2008 @@ -198,3 +198,4 @@ gtk_widget_grab_focus (widget); return gtk_widget_is_focus (widget); } + Modified: trunk/gtk/src/ygtkfindentry.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.c?rev=5163… ============================================================================== --- trunk/gtk/src/ygtkfindentry.c (original) +++ trunk/gtk/src/ygtkfindentry.c Mon Sep 29 13:38:30 2008 @@ -9,6 +9,8 @@ #include "ygtkfindentry.h" #include <gtk/gtk.h> +static guint menu_item_selected_signal = 0; + G_DEFINE_TYPE (YGtkExtEntry, ygtk_ext_entry, GTK_TYPE_ENTRY) static void ygtk_ext_entry_init (YGtkExtEntry *entry) @@ -247,34 +249,6 @@ /* YGtkFindEntry widget */ // check the header file for information about this widget -#include <string.h> -#define ARROW_SIZE 7 - -static void ygtk_find_entry_editable_init (GtkEditableClass *iface); - -G_DEFINE_TYPE_WITH_CODE (YGtkFindEntry, ygtk_find_entry, YGTK_TYPE_EXT_ENTRY, - G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, ygtk_find_entry_editable_init)) - -static void ygtk_find_entry_init (YGtkFindEntry *entry) -{ -} - -static void ygtk_find_entry_destroy (GtkObject *object) -{ - GTK_OBJECT_CLASS (ygtk_find_entry_parent_class)->destroy (object); - - YGtkFindEntry *entry = YGTK_FIND_ENTRY (object); - -#define DESTROY_ICON(icon) \ - if (icon) { g_object_unref (G_OBJECT (icon)); icon = NULL; } - - DESTROY_ICON (entry->find_icon) - DESTROY_ICON (entry->find_hover_icon) - DESTROY_ICON (entry->clear_icon) - DESTROY_ICON (entry->clear_hover_icon) -#undef DESTROY_ICON -} - // Code from Banshee: shades a pixbuf a bit, used to provide the hover effect static inline guchar pixel_clamp (int val) { return MAX (0, MIN (255, val)); } @@ -309,6 +283,50 @@ return dest; } +static void generate_icon (GtkWidget *widget, const char *stock_icon, + GdkPixbuf **normal_icon, GdkPixbuf **hover_icon) +{ + if (*normal_icon) { + g_object_unref (G_OBJECT (*normal_icon)); + *normal_icon = NULL; + } + if (*hover_icon) { + g_object_unref (G_OBJECT (*hover_icon)); + *hover_icon = NULL; + } + if (stock_icon) { + *normal_icon = gtk_widget_render_icon (widget, stock_icon, GTK_ICON_SIZE_MENU, NULL); + *hover_icon = pixbuf_color_shift (*normal_icon, 30); + } +} + +#include <string.h> +#define ARROW_SIZE 7 + +static void ygtk_find_entry_editable_init (GtkEditableClass *iface); + +G_DEFINE_TYPE_WITH_CODE (YGtkFindEntry, ygtk_find_entry, YGTK_TYPE_EXT_ENTRY, + G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE, ygtk_find_entry_editable_init)) + +static void ygtk_find_entry_init (YGtkFindEntry *entry) +{ + entry->selected_item = -1; +} + +static void ygtk_find_entry_destroy (GtkObject *object) +{ + GTK_OBJECT_CLASS (ygtk_find_entry_parent_class)->destroy (object); + + YGtkFindEntry *fentry = YGTK_FIND_ENTRY (object); + generate_icon (NULL, NULL, &fentry->find_icon, &fentry->find_hover_icon); + generate_icon (NULL, NULL, &fentry->clear_icon, &fentry->clear_hover_icon); + + if (fentry->completion_timer_id) { + g_source_remove (fentry->completion_timer_id); + fentry->completion_timer_id = 0; + } +} + static void ygtk_find_entry_set_borders (YGtkFindEntry *entry) { YGtkExtEntry *eentry = YGTK_EXT_ENTRY (entry); @@ -328,24 +346,32 @@ gtk_widget_queue_resize (GTK_WIDGET (entry)); } +static void generate_find_icon (YGtkFindEntry *entry) +{ + char *stock = GTK_STOCK_FIND; + if (entry->context_menu && entry->selected_item >= 0) { + GtkImageMenuItem *item; + GList *items = gtk_container_get_children (GTK_CONTAINER (entry->context_menu)); + item = (GtkImageMenuItem *) g_list_nth_data (items, entry->selected_item); + g_list_free (items); + gtk_image_get_stock (GTK_IMAGE (gtk_image_menu_item_get_image (item)), &stock, NULL); + } + generate_icon (GTK_WIDGET (entry), stock, &entry->find_icon, &entry->find_hover_icon); +} + static void ygtk_find_entry_realize (GtkWidget *widget) { GTK_WIDGET_CLASS (ygtk_find_entry_parent_class)->realize (widget); YGtkExtEntry *eentry = YGTK_EXT_ENTRY (widget); YGtkFindEntry *fentry = YGTK_FIND_ENTRY (widget); - fentry->find_icon = gtk_widget_render_icon (widget, GTK_STOCK_FIND, - GTK_ICON_SIZE_MENU, NULL); - fentry->clear_icon = gtk_widget_render_icon (widget, GTK_STOCK_CLEAR, - GTK_ICON_SIZE_MENU, NULL); - - fentry->find_hover_icon = pixbuf_color_shift (fentry->find_icon, 30); - fentry->clear_hover_icon = pixbuf_color_shift (fentry->clear_icon, 30); + generate_find_icon (fentry); + generate_icon (widget, GTK_STOCK_CLEAR, &fentry->clear_icon, &fentry->clear_hover_icon); ygtk_find_entry_set_borders (fentry); GdkDisplay *display = gtk_widget_get_display (widget); - GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_HAND1); + GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_HAND2); gdk_window_set_cursor (eentry->left_window, cursor); gdk_window_set_cursor (eentry->right_window, cursor); @@ -413,11 +439,25 @@ return FALSE; } +static void popup_menu_position (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer pdata) +{ + GtkWidget *widget = (GtkWidget *) pdata; + GtkAllocation *alloc = &widget->allocation; + gdk_window_get_origin (widget->window, x, y); + *y += alloc->height; + *push_in = TRUE; + + GtkRequisition req; + gtk_widget_size_request (GTK_WIDGET (menu), &req); + if (alloc->width > req.width) + gtk_widget_set_size_request (GTK_WIDGET (menu), alloc->width, -1); +} + static void ygtk_find_entry_actual_popup_menu (GtkWidget *widget, guint button, guint32 time) { GtkMenu *menu = YGTK_FIND_ENTRY (widget)->context_menu; - gtk_menu_popup (menu, NULL, NULL, NULL, NULL, button, time); + gtk_menu_popup (menu, NULL, NULL, popup_menu_position, widget, button, time); } static gboolean ygtk_find_entry_popup_menu (GtkWidget *widget) @@ -458,6 +498,55 @@ return *gtk_entry_get_text (GTK_ENTRY (entry)) == '\0'; } +static void ygtk_find_entry_insert_completion (YGtkFindEntry *fentry, const char *text) +{ + if (strlen (text) < 5) + return; + GtkEntry *entry = GTK_ENTRY (fentry); + GtkEntryCompletion *completion = gtk_entry_get_completion (entry); + if (!completion) { + completion = gtk_entry_completion_new(); + gtk_entry_set_completion (entry, completion); + g_object_unref (completion); + + GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); + gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (store)); + g_object_unref (G_OBJECT (store)); + gtk_entry_completion_set_text_column (completion, 0); + } + + GtkTreeModel *model = gtk_entry_completion_get_model (completion); + GtkTreeIter iter; + gboolean already_there = FALSE; + if (gtk_tree_model_get_iter_first (model, &iter)) { + do { + gchar *i; + gtk_tree_model_get (model, &iter, 0, &i, -1); + if (!g_ascii_strcasecmp (text, i)) + already_there = TRUE; + g_free (i); + } while (gtk_tree_model_iter_next (model, &iter) && !already_there); + } + if (!already_there) { + GtkListStore *store = GTK_LIST_STORE (model); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, text, -1); + } +} + +#define INSERT_COMPLETION_TIMOUT 500 + +static gboolean completion_timeout_cb (void *pdata) +{ + YGtkFindEntry *fentry = (YGtkFindEntry *) pdata; + GtkEntry *entry = GTK_ENTRY (fentry); + const char *text = gtk_entry_get_text (entry); + if (*text) + ygtk_find_entry_insert_completion (fentry, text); + fentry->completion_timer_id = 0; + return FALSE; +} + static void ygtk_find_entry_insert_text (GtkEditable *editable, const gchar *new_text, gint new_text_len, gint *pos) { @@ -473,6 +562,10 @@ gdk_window_show (clear_win); gtk_widget_queue_resize (GTK_WIDGET (editable)); } + if (fentry->completion_timer_id) + g_source_remove (fentry->completion_timer_id); + fentry->completion_timer_id = g_timeout_add (INSERT_COMPLETION_TIMOUT, + completion_timeout_cb, fentry); } static void ygtk_find_entry_delete_text (GtkEditable *editable, gint start_pos, @@ -489,6 +582,9 @@ gdk_window_hide (clear_win); gtk_widget_queue_resize (GTK_WIDGET (editable)); } + if (fentry->completion_timer_id) + g_source_remove (fentry->completion_timer_id); + fentry->completion_timer_id = 0; } void ygtk_find_entry_attach_menu (YGtkFindEntry *entry, GtkMenu *menu) @@ -501,6 +597,38 @@ ygtk_find_entry_set_borders (entry); } +static void menu_item_activate_cb (GtkMenuItem *item, YGtkFindEntry *entry) +{ + GtkWidget *menu = gtk_widget_get_parent (GTK_WIDGET (item)); + GList *items = gtk_container_get_children (GTK_CONTAINER (menu)); + entry->selected_item = g_list_index (items, item); + g_signal_emit (entry, menu_item_selected_signal, 0, entry->selected_item); + g_list_free (items); + generate_find_icon (entry); +} + +guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock) +{ + if (!entry->context_menu) + ygtk_find_entry_attach_menu (entry, GTK_MENU (gtk_menu_new())); + GtkWidget *item = gtk_image_menu_item_new_with_label (text); + GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); + gtk_menu_shell_append (GTK_MENU_SHELL (entry->context_menu), item); + gtk_widget_show_all (GTK_WIDGET (entry->context_menu)); + g_signal_connect (G_OBJECT (item), "activate", + G_CALLBACK (menu_item_activate_cb), entry); + GList *items = gtk_container_get_children (GTK_CONTAINER (entry->context_menu)); + guint nb = g_list_length (items)-1; + g_list_free (items); + return nb; +} + +gint ygtk_find_entry_get_selected_item (YGtkFindEntry *entry) +{ + return entry->selected_item; +} + GtkWidget *ygtk_find_entry_new (void /*gboolean will_use_find_icon */) { return g_object_new (YGTK_TYPE_FIND_ENTRY, NULL); @@ -519,6 +647,11 @@ GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); gtkobject_class->destroy = ygtk_find_entry_destroy; + + menu_item_selected_signal = g_signal_new ("menu_item_selected", + G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (YGtkFindEntryClass, menu_item_selected), + NULL, NULL, gtk_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); } static void ygtk_find_entry_editable_init (GtkEditableClass *iface) @@ -526,3 +659,4 @@ iface->insert_text = ygtk_find_entry_insert_text; iface->delete_text = ygtk_find_entry_delete_text; } + Modified: trunk/gtk/src/ygtkfindentry.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkfindentry.h?rev=5163… ============================================================================== --- trunk/gtk/src/ygtkfindentry.h (original) +++ trunk/gtk/src/ygtkfindentry.h Mon Sep 29 13:38:30 2008 @@ -12,7 +12,8 @@ is set). If you don't want that, use gtk_widget_set_direction(). YGtkFindEntry is a convinience widget that has a find icon, with an - optional menu, at the left, and an erase icon at the right. + optional menu, at the left, and an erase icon at the right. It can + interact with an option image menu, and does auto-completion. */ #ifndef YGTK_FIND_ENTRY_H @@ -83,17 +84,28 @@ // members GdkPixbuf *find_icon, *clear_icon, *find_hover_icon, *clear_hover_icon; GtkMenu *context_menu; + gint selected_item; + guint completion_timer_id; } YGtkFindEntry; typedef struct _YGtkFindEntryClass { YGtkExtEntryClass parent_class; + + // signals: + void (*menu_item_selected) (YGtkFindEntry *entry, gint nb); } YGtkFindEntryClass; GtkWidget* ygtk_find_entry_new (void); GType ygtk_find_entry_get_type (void) G_GNUC_CONST; +// add an external menu void ygtk_find_entry_attach_menu (YGtkFindEntry *entry, GtkMenu *popup_menu); +// add an internal menu +guint ygtk_find_entry_insert_item (YGtkFindEntry *entry, const char *text, const char *stock); +gint ygtk_find_entry_get_selected_item (YGtkFindEntry *entry); + G_END_DECLS #endif /*YGTK_FIND_ENTRY_H*/ + Modified: trunk/gtk/src/ygtkhandlebox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkhandlebox.h?rev=5163… ============================================================================== --- trunk/gtk/src/ygtkhandlebox.h (original) +++ trunk/gtk/src/ygtkhandlebox.h Mon Sep 29 13:38:30 2008 @@ -23,7 +23,7 @@ #define YGTK_IS_HANDLE_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ YGTK_TYPE_HANDLE_BOX)) #define YGTK_HANDLE_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - YGTK_TYPE_HANDLE_BOX, YGtkHandleboxClass)) + YGTK_TYPE_HANDLE_BOX, YGtkHandleBoxClass)) typedef struct _YGtkHandleBox { Modified: trunk/gtk/src/ygtklinklabel.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtklinklabel.c?rev=5163… ============================================================================== --- trunk/gtk/src/ygtklinklabel.c (original) +++ trunk/gtk/src/ygtklinklabel.c Mon Sep 29 13:38:30 2008 @@ -33,7 +33,7 @@ GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK; gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_CURSOR; attributes.cursor = gdk_cursor_new_for_display ( - gtk_widget_get_display (widget), GDK_HAND1); + gtk_widget_get_display (widget), GDK_HAND2); YGtkLinkLabel *label = YGTK_LINK_LABEL (widget); label->link_window = gdk_window_new (widget->window, &attributes, attributes_mask); Modified: trunk/gtk/src/ygtkmenubutton.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkmenubutton.c?rev=516… ============================================================================== --- trunk/gtk/src/ygtkmenubutton.c (original) +++ trunk/gtk/src/ygtkmenubutton.c Mon Sep 29 13:38:30 2008 @@ -145,6 +145,7 @@ GtkWidget *widget = GTK_WIDGET (button); GtkAllocation *button_alloc = &widget->allocation; + // the popup would look awful if smaller than the button GtkRequisition req; gtk_widget_size_request (button->popup, &req); int popup_width = req.width, popup_height = req.height; Added: trunk/gtk/src/ygtkprogressbar.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkprogressbar.c?rev=51… ============================================================================== --- trunk/gtk/src/ygtkprogressbar.c (added) +++ trunk/gtk/src/ygtkprogressbar.c Mon Sep 29 13:38:30 2008 @@ -0,0 +1,146 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkProgressBar widget */ +// check the header file for information about this widget + +#include <config.h> +#include "ygtkprogressbar.h" + +#define ENABLE_CONTINUOUS +#define STEP_TIME 50 + +G_DEFINE_TYPE (YGtkProgressBar, ygtk_progress_bar, GTK_TYPE_PROGRESS_BAR) + +static void ygtk_progress_bar_init (YGtkProgressBar *bar) +{ + bar->continuous = TRUE; +} + +static void remove_timeout (YGtkProgressBar *bar) +{ + if (bar->step_timeout_id) { + g_source_remove (bar->step_timeout_id); + bar->step_timeout_id = 0; + } +} + +static void ygtk_progress_bar_finalize (GObject *object) +{ + YGtkProgressBar *bar = YGTK_PROGRESS_BAR (object); + remove_timeout (bar); + G_OBJECT_CLASS (ygtk_progress_bar_parent_class)->finalize (object); +} + +static void ygtk_progress_bar_realize (GtkWidget *widget) +{ + GTK_WIDGET_CLASS (ygtk_progress_bar_parent_class)->realize (widget); + YGtkProgressBar *bar = YGTK_PROGRESS_BAR (widget); + if (bar->continuous) + ygtk_progress_bar_set_fraction (bar, 0); +} + +GtkWidget* ygtk_progress_bar_new (void) +{ return g_object_new (YGTK_TYPE_PROGRESS_BAR, NULL); } + +#ifdef ENABLE_CONTINUOUS + +static gboolean step_timeout_cb (void *pdata) +{ + YGtkProgressBar *ybar = (YGtkProgressBar *) pdata; + GtkProgressBar *bar = GTK_PROGRESS_BAR (ybar); + + gdouble vel = (ybar->vel/1000) * STEP_TIME; + gdouble fraction = gtk_progress_bar_get_fraction (bar) + vel; + if (fraction >= ybar->dist) { + gtk_progress_bar_set_fraction (bar, ybar->dist); + ybar->step_timeout_id = 0; + return FALSE; + } + gtk_progress_bar_set_fraction (bar, fraction); + return TRUE; +} + +static gdouble delta_time (GTimeVal *time_i) +{ + GTimeVal time_f; + g_get_current_time (&time_f); + gdouble sec = time_f.tv_sec - time_i->tv_sec; + gdouble usec = time_f.tv_usec - time_i->tv_usec; + return sec + usec/G_USEC_PER_SEC; +} + +void ygtk_progress_bar_set_fraction (YGtkProgressBar *ybar, gdouble fraction) +{ + GtkProgressBar *bar = GTK_PROGRESS_BAR (ybar); + if (ybar->continuous) { + if (fraction == 0) { +#if 1 + ybar->dist = ybar->vel = 0; +#else // kick some movement already + ybar->dist = 0.10; + ybar->vel = 0.02; +#endif + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (ybar), 0); + } + else { + gdouble delta_t = delta_time (&ybar->time_i); + if (delta_t > 10 || fraction < ybar->fraction || !GTK_WIDGET_REALIZED (bar)) { + ybar->fraction = fraction; + ygtk_progress_bar_disable_continuous (ybar); + return; + } + + gdouble anim_fraction = gtk_progress_bar_get_fraction (bar); + ybar->dist = MIN (2*fraction - ybar->fraction, 1); + if (delta_t < 0.01) + ybar->vel = 0.10; + else { + ybar->vel = MAX ((ybar->dist - anim_fraction) / delta_t, 0); + if (ybar->dist == 1) // finishing up! + ybar->vel += 0.020; + else // better slower than wait + ybar->vel = MAX (ybar->vel-0.005, 0); + } +/* char *text = g_strdup_printf ("%d %%", (int)(fraction*100)); + gtk_progress_bar_set_text (bar, text); + g_free (text);*/ + } + g_get_current_time (&ybar->time_i); + ybar->fraction = fraction; + if (!ybar->step_timeout_id) + ybar->step_timeout_id = g_timeout_add (STEP_TIME, step_timeout_cb, ybar); + } + else + gtk_progress_bar_set_fraction (bar, fraction); +} + +#else + +void ygtk_progress_bar_set_fraction (YGtkProgressBar *ybar, gdouble fraction) +{ + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (ybar), fraction); +} + +#endif + +void ygtk_progress_bar_disable_continuous (YGtkProgressBar *bar) +{ + bar->continuous = FALSE; + remove_timeout (bar); + if (!GTK_WIDGET_REALIZED (bar)) + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), bar->fraction); +} + +static void ygtk_progress_bar_class_init (YGtkProgressBarClass *klass) +{ + ygtk_progress_bar_parent_class = g_type_class_peek_parent (klass); + + GObjectClass *object_class = G_OBJECT_CLASS (klass); + object_class->finalize = ygtk_progress_bar_finalize; + + GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); + widget_class->realize = ygtk_progress_bar_realize; +} + Added: trunk/gtk/src/ygtkprogressbar.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkprogressbar.h?rev=51… ============================================================================== --- trunk/gtk/src/ygtkprogressbar.h (added) +++ trunk/gtk/src/ygtkprogressbar.h Mon Sep 29 13:38:30 2008 @@ -0,0 +1,51 @@ +/******************************************************************** + * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * + ********************************************************************/ + +/* YGtkProgressBar makes the progress moves go smooth. +*/ + +#ifndef YGTK_PROGRESS_BAR_H +#define YGTK_PROGRESS_BAR_H + +#include <gtk/gtkprogressbar.h> + +G_BEGIN_DECLS + +#define YGTK_TYPE_PROGRESS_BAR (ygtk_progress_bar_get_type ()) +#define YGTK_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_PROGRESS_BAR, YGtkProgressBar)) +#define YGTK_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_PROGRESS_BAR, YGtkProgressBarClass)) +#define YGTK_IS_PROGRESS_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_PROGRESS_BAR)) +#define YGTK_IS_PROGRESS_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_PROGRESS_BAR)) +#define YGTK_PROGRESS_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_PROGRESS_BAR, YGtkProgresBarClass)) + +typedef struct _YGtkProgressBar +{ + GtkProgressBar parent; + // private: + gdouble vel, dist, fraction; + guint step_timeout_id; + GTimeVal time_i; + gboolean continuous; +} YGtkProgressBar; + +typedef struct _YGtkProgressBarClass +{ + GtkProgressBarClass parent_class; +} YGtkProgressBarClass; + +GtkWidget* ygtk_progress_bar_new (void); +GType ygtk_progress_bar_get_type (void) G_GNUC_CONST; + +void ygtk_progress_bar_set_fraction (YGtkProgressBar *bar, gdouble fraction); +void ygtk_progress_bar_disable_continuous (YGtkProgressBar *bar); + +G_END_DECLS + +#endif /* YGTK_PROGRESS_BAR_H */ + Modified: trunk/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkrichtext.c?rev=51632… ============================================================================== --- trunk/gtk/src/ygtkrichtext.c (original) +++ trunk/gtk/src/ygtkrichtext.c Mon Sep 29 13:38:30 2008 @@ -108,7 +108,7 @@ // Init link support GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (rtext)); - rtext->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND1); + rtext->hand_cursor = gdk_cursor_new_for_display (display, GDK_HAND2); gdk_cursor_ref (rtext->hand_cursor); #if GTK_CHECK_VERSION(2,10,0) Modified: trunk/gtk/src/ygtktimezonepicker.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtktimezonepicker.c?rev… ============================================================================== --- trunk/gtk/src/ygtktimezonepicker.c (original) +++ trunk/gtk/src/ygtktimezonepicker.c Mon Sep 29 13:38:30 2008 @@ -370,8 +370,7 @@ loc = find_location_closer_to (picker, event->x, event->y); if (loc && loc != picker->selected_loc) { picker->selected_loc = loc; - g_signal_emit (picker, zone_clicked_signal, - 0, picker->selected_loc->zone); + g_signal_emit (picker, zone_clicked_signal, 0, picker->selected_loc->zone); } picker->last_mouse_x = event->x; picker->last_mouse_y = event->y; @@ -550,7 +549,7 @@ GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass); gtkobject_class->destroy = ygtk_time_zone_picker_destroy; - zone_clicked_signal = g_signal_new ("zone-clicked", + zone_clicked_signal = g_signal_new ("zone_clicked", G_TYPE_FROM_CLASS (G_OBJECT_CLASS (klass)), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (YGtkTimeZonePickerClass, zone_clicked), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5163… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Mon Sep 29 13:38:30 2008 @@ -1230,7 +1230,7 @@ break; } } - if (match && !highlight) { + if (match && !highlight && use_name) { if (values.size() == 1 && !strcasecmp (values.front().c_str(), package->name().c_str())) highlight = package; } Added: trunk/gtk/tests/ProgressBar.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/ProgressBar.ycp?rev=51… ============================================================================== --- trunk/gtk/tests/ProgressBar.ycp (added) +++ trunk/gtk/tests/ProgressBar.ycp Mon Sep 29 13:38:30 2008 @@ -0,0 +1,45 @@ +// Auto ProgressBar example +{ + integer max_progress = 10; + integer progress = 0; + + UI::OpenDialog( + `VBox( + `MinSize (60, 0, `ProgressBar (`id (`pr), "Progress bar", max_progress, progress)), + `Right (`PushButton (`id (`close), "&Close")) + ) + ); + + symbol strategy = `same; + integer timeout = 0; + + while (progress < max_progress) { + if (strategy == `same) + timeout = 2000; + else if (strategy == `incremental) { + if (timeout == 0) + timeout = 3000; + else + timeout = timeout - 250; + } + else if (strategy == `decremental) { + if (timeout == 0) + timeout = 500; + else + timeout = timeout + 250; + } +/* else if (strategy == `random) + timeout = 2000;*/ + sleep (timeout); + + symbol event = (symbol) UI::PollInput(); + if (event == `close || event == `cancel) + break; + + progress = progress + 1; + UI::ChangeWidget(`id(`pr), `Value, progress); + } + + UI::CloseDialog(); +} + -- 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] r51631 - in /trunk/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: rhafer Date: Mon Sep 29 13:08:00 2008 New Revision: 51631 URL: http://svn.opensuse.org/viewcvs/yast?rev=51631&view=rev Log: preparing 2.17.8 Modified: trunk/ldap-server/VERSION trunk/ldap-server/package/yast2-ldap-server.changes Modified: trunk/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/VERSION?rev=51631&r1… ============================================================================== --- trunk/ldap-server/VERSION (original) +++ trunk/ldap-server/VERSION Mon Sep 29 13:08:00 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Mon Sep 29 13:08:00 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Sep 29 13:03:41 CEST 2008 - rhafer(a)suse.de + +- Version 2.17.8 + * revived AutoYaST support (bnc#429528) + * Additional fix for installation proposal. Don't propose + configuration if openldap2 is not installed (bnc#426593) + +------------------------------------------------------------------- Wed Sep 24 12:58:24 CEST 2008 - rhafer(a)suse.de - Version 2.17.7 -- 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] r51630 - /trunk/ldap-server/src/ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 29 Sep '08

29 Sep '08

Author: rhafer Date: Mon Sep 29 13:07:56 2008 New Revision: 51630 URL: http://svn.opensuse.org/viewcvs/yast?rev=51630&view=rev Log: don't enable Service if openldap2 is not installed Modified: trunk/ldap-server/src/ldap-server_proposal.ycp Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_prop… ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Mon Sep 29 13:07:56 2008 @@ -65,6 +65,7 @@ LdapServer::WriteServiceEnabled( true ); } defaults = LdapServer::CreateInitialDefaults(); + defaults["serviceEnabled"] = LdapServer::ReadServiceEnabled(); defaults["rootpw_clear"] = Users::GetRootPassword(); LdapServer::SetInitialDefaults(defaults); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0