February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63375 - /tags/stable-2_21_91/
by rpmcruz＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: rpmcruz Date: Tue Feb 8 19:29:46 2011 New Revision: 63375 URL: http://svn.opensuse.org/viewcvs/yast?rev=63375&view=rev Log: Created tag stable-2_21_91 Added: tags/stable-2_21_91/ -- 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] r63374 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes src/YGTreeView.cc
by rpmcruz＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: rpmcruz Date: Tue Feb 8 19:29:39 2011 New Revision: 63374 URL: http://svn.opensuse.org/viewcvs/yast?rev=63374&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGTreeView.cc Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=63374&r1=63373&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Tue Feb 8 19:29:39 2011 @@ -1 +1 @@ -2.21.90 +2.21.91 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=63374&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Tue Feb 8 19:29:39 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "90") +SET(VERSION_PATCH "91") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Tue Feb 8 19:29:39 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 08 18:28:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.91 +- fixed compatibility with upcoming yast2-libyui 2.20.1. + +------------------------------------------------------------------- Tue Feb 01 22:43:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.90 Modified: trunk/gtk/src/YGTreeView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTreeView.cc?rev=63374&… ============================================================================== --- trunk/gtk/src/YGTreeView.cc (original) +++ trunk/gtk/src/YGTreeView.cc Tue Feb 8 19:29:39 2011 @@ -199,6 +199,14 @@ gtk_tree_model_foreach (getModel(), inner::foreach_unmark, this); } + YItem *getFocusItem() + { + GtkTreeIter iter; + if (gtk_tree_selection_get_selected (getSelection(), NULL, &iter)) + return getYItem (&iter); + return NULL; + } + virtual bool _immediateMode() { return true; } virtual bool _shrinkable() { return false; } @@ -619,12 +627,7 @@ // YMultiSelectionBox virtual YItem *currentItem() - { - GtkTreeIter iter; - if (gtk_tree_selection_get_selected (getSelection(), NULL, &iter)) - return getYItem (&iter); - return NULL; - } + { return getFocusItem(); } virtual void setCurrentItem (YItem *item) { focusItem (item, true); } @@ -748,6 +751,9 @@ syncCount(); } + virtual YTreeItem *currentItem() + { return (YTreeItem *) getFocusItem(); } + // YGSelectionStore void doAddItem (YItem *item) {} // rebuild will be called anyway -- 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] r63373 - /tags/stable-2_20_12/yast2/
by jsrain＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: jsrain Date: Tue Feb 8 16:45:42 2011 New Revision: 63373 URL: http://svn.opensuse.org/viewcvs/yast?rev=63373&view=rev Log: Created tag stable-2_20_12 for yast2 Added: tags/stable-2_20_12/yast2/ (props changed) - copied from r63372, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63372 - in /trunk/yast2: VERSION library/system/src/Initrd.ycp package/yast2.changes
by jsrain＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: jsrain Date: Tue Feb 8 16:45:33 2011 New Revision: 63372 URL: http://svn.opensuse.org/viewcvs/yast?rev=63372&view=rev Log: do not define splash screen resolution to mkinitrd if boot splash is not installed (bnc#670225) Modified: trunk/yast2/VERSION trunk/yast2/library/system/src/Initrd.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63372&r1=63371… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Tue Feb 8 16:45:33 2011 @@ -1 +1 @@ -2.20.11 +2.20.12 Modified: trunk/yast2/library/system/src/Initrd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Initrd.… ============================================================================== --- trunk/yast2/library/system/src/Initrd.ycp (original) +++ trunk/yast2/library/system/src/Initrd.ycp Tue Feb 8 16:45:33 2011 @@ -405,8 +405,11 @@ SCR::Write (.sysconfig.kernel, nil); // recreate initrd string param = ""; - if (splash != "" && splash != nil) + if (splash != "" && splash != nil + && 0 < (integer)SCR::Read (.target.size, "/lib/mkinitrd/scripts/setup-splash.sh")) + { param = sformat ("-s %1", splash); + } if ( SCR::Execute (.target.bash, sformat ("/sbin/mkinitrd %1 %2 >> \ %3 2>&1", param, additional_parameters, Directory::logdir + "/y2logmkinitrd")) != 0 ) Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Feb 8 16:45:33 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 8 16:37:35 CET 2011 - jsrain(a)suse.cz + +- do not define splash screen resolution to mkinitrd if boot splash + is not installed (bnc#670225) +- 2.20.12 + +------------------------------------------------------------------- Wed Jan 19 13:49:18 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) -- 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] r63371 - in /trunk/installation: control/control.openSUSE.xml control/docs/control-section.xml control/docs/examples/supported_desktops.xml package/yast2-installation.changes
by locilka＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: locilka Date: Tue Feb 8 15:11:59 2011 New Revision: 63371 URL: http://svn.opensuse.org/viewcvs/yast?rev=63371&view=rev Log: - Adapted openSUSE control file to the current naming schema of desktops (BNC #667408) Modified: trunk/installation/control/control.openSUSE.xml trunk/installation/control/docs/control-section.xml trunk/installation/control/docs/examples/supported_desktops.xml trunk/installation/package/yast2-installation.changes 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 Tue Feb 8 15:11:59 2011 @@ -273,8 +273,8 @@ <one_supported_desktop> <name>kde</name> -  - <desktop>startkde</desktop> +  + <desktop>kde4</desktop> <label_id>desktop_kde</label_id> <logon>kdm</logon> <cursor>DMZ</cursor> @@ -286,7 +286,8 @@ <one_supported_desktop> <name>xfce</name> - <desktop>startxfce4</desktop> +  + <desktop>xfce</desktop> <label_id>desktop_xfce</label_id> <logon>gdm</logon> <cursor>DMZ</cursor> @@ -299,7 +300,8 @@  <one_supported_desktop> <name>lxde</name> - <desktop>startlxde</desktop> +  + <desktop>lxde</desktop> <label_id>desktop_lxde</label_id> <logon>lxdm</logon> <cursor>DMZ</cursor> Modified: trunk/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/contro… ============================================================================== --- trunk/installation/control/docs/control-section.xml (original) +++ trunk/installation/control/docs/control-section.xml Tue Feb 8 15:11:59 2011 @@ -833,7 +833,7 @@ <listitem> <para>(string) <emphasis>desktop</emphasis></para> - <para>Desktop to start (gnome, startkde4, startkde3, startxfce4, ...).</para> + <para>Desktop to start (gnome, kde4, kde, xfce, ...).</para> </listitem> <listitem> Modified: trunk/installation/control/docs/examples/supported_desktops.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/docs/exampl… ============================================================================== --- trunk/installation/control/docs/examples/supported_desktops.xml (original) +++ trunk/installation/control/docs/examples/supported_desktops.xml Tue Feb 8 15:11:59 2011 @@ -20,7 +20,7 @@ <one_supported_desktop> <name>kde</name> - <desktop>startkde4</desktop> + <desktop>kde4</desktop>  <label_id>desktop_kde</label_id> <logon>kdm4</logon> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Feb 8 15:11:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 8 15:10:25 CET 2011 - locilka(a)suse.cz + +- Adapted openSUSE control file to the current naming schema of + desktops (BNC #667408) + +------------------------------------------------------------------- Thu Jan 20 14:18:41 CET 2011 - jsrain(a)suse.cz - fix initialization of AutoUpgrade for 2nd stage -- 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] r63370 - in /trunk/ycp-ui-bindings: VERSION package/yast2-ycp-ui-bindings.changes src/YCPPropertyHandler.cc src/YCPPropertyHandler.h yast2-ycp-ui-bindings.spec.in
by tgoettlicher＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: tgoettlicher Date: Tue Feb 8 12:21:32 2011 New Revision: 63370 URL: http://svn.opensuse.org/viewcvs/yast?rev=63370&view=rev Log: - Added support for currentItem to tree widget Modified: trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc trunk/ycp-ui-bindings/src/YCPPropertyHandler.h 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=6337… ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Tue Feb 8 12:21:32 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 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 Tue Feb 8 12:21:32 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 8 12:17:41 CET 2011 - tgoettlicher(a)suse.de + +- Added support for currentItem to tree widget +- V 2.20.2 + +------------------------------------------------------------------- Sun Feb 6 10:00:59 UTC 2011 - coolo(a)novell.com - fix syntax error Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyH… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.cc Tue Feb 8 12:21:32 2011 @@ -192,7 +192,7 @@ else if ( propertyName == YUIProperty_CurrentItem ) { val = tryGetSelectionBoxValue ( widget ); if ( ! val.isNull() ) return val; - val = tryGetTreeValue ( widget ); if ( ! val.isNull() ) return val; + val = tryGetTreeCurrentItem ( widget ); if ( ! val.isNull() ) return val; val = tryGetTableValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetComboBoxValue ( widget ); if ( ! val.isNull() ) return val; val = tryGetDumbTabValue ( widget ); if ( ! val.isNull() ) return val; @@ -1259,6 +1259,31 @@ return YCPTableItemWriter::itemList( table->itemsBegin(), table->itemsEnd() ); } +YCPValue +YCPPropertyHandler::tryGetTreeCurrentItem( YWidget * widget ) +{ + YTree * tree = dynamic_cast<YTree *> (widget); + + if ( ! tree ) + return YCPNull(); + + YItem * currentItem = tree->currentItem(); + + if ( tree ) + { + YCPTreeItem * item = dynamic_cast<YCPTreeItem *> (currentItem); + + if ( item ) + return item->id(); + else + y2error( "Item is not a YCPItem: \"%s\"", currentItem->label().c_str() ); + } + + return YCPVoid(); + +} + + YCPValue YCPPropertyHandler::tryGetTreeItems( YWidget * widget ) Modified: trunk/ycp-ui-bindings/src/YCPPropertyHandler.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPPropertyH… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPPropertyHandler.h (original) +++ trunk/ycp-ui-bindings/src/YCPPropertyHandler.h Tue Feb 8 12:21:32 2011 @@ -160,6 +160,8 @@ static YCPValue tryGetSelectionWidgetItems ( YWidget * widget ); static YCPValue tryGetBarGraphValues ( YWidget * widget ); static YCPValue tryGetBarGraphLabels ( YWidget * widget ); + static YCPValue tryGetTreeCurrentItem ( YWidget * widget ); + /** 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 Tue Feb 8 12:21:32 2011 @@ -21,8 +21,8 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -Requires: yast2-libyui >= 2.20.0 -BuildRequires: yast2-libyui-devel >= 2.20.0 +Requires: yast2-libyui >= 2.20.1 +BuildRequires: yast2-libyui-devel >= 2.20.1 # 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] r63369 - in /trunk/libyui: VERSION package/yast2-libyui.changes src/YTree.h
by tgoettlicher＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: tgoettlicher Date: Tue Feb 8 12:20:08 2011 New Revision: 63369 URL: http://svn.opensuse.org/viewcvs/yast?rev=63369&view=rev Log: - Added support for currentItem to tree widget Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes trunk/libyui/src/YTree.h Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=63369&r1=6336… ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Tue Feb 8 12:20:08 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 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 Tue Feb 8 12:20:08 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 8 12:16:30 CET 2011 - tgoettlicher(a)suse.de + +- Added support for currentItem to tree widget +- V 2.20.1 + +------------------------------------------------------------------- Thu Feb 3 15:05:30 CET 2011 - tgoettlicher(a)suse.de - V 2.20.0 Modified: trunk/libyui/src/YTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/src/YTree.h?rev=63369&r1=… ============================================================================== --- trunk/libyui/src/YTree.h (original) +++ trunk/libyui/src/YTree.h Tue Feb 8 12:20:08 2011 @@ -178,6 +178,17 @@ bool hasMultiSelection() const; + /** + * Return the the item that currently has the keyboard focus + * or 0 if no item currently has the keyboard focus. + * + * Notice that for a MultiSelectionBox the current item is not necessarily + * selected, i.e., its check box may or may not be checked. + * + * Derived classes are required to implement this function. + **/ + virtual YTreeItem * currentItem() = 0; + private: -- 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] r63368 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTree.cc src/YQTree.h yast2-qt.spec.in
by tgoettlicher＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: tgoettlicher Date: Tue Feb 8 12:18:40 2011 New Revision: 63368 URL: http://svn.opensuse.org/viewcvs/yast?rev=63368&view=rev Log: - Added support for currentItem to tree widget Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTree.cc trunk/qt/src/YQTree.h trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63368&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Feb 8 12:18:40 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Feb 8 12:18:40 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 8 12:20:04 CET 2011 - tgoettlicher(a)suse.de + +- Added support for currentItem to tree widget +- V 2.20.1 + +------------------------------------------------------------------- Thu Feb 3 17:09:08 CET 2011 - tgoettlicher(a)suse.de - Added ValueChanged event to TreeWidget Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=63368&r1=63… ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Tue Feb 8 12:18:40 2011 @@ -98,6 +98,9 @@ connect( _qt_treeWidget, SIGNAL( itemSelectionChanged () ), this, SLOT ( slotSelectionChanged () ) ); + connect( _qt_treeWidget, SIGNAL( itemClicked ( QTreeWidgetItem *, int ) ), + this, SLOT ( slotItemClicked ( QTreeWidgetItem *, int ) ) ); + connect( _qt_treeWidget, SIGNAL( itemChanged ( QTreeWidgetItem *, int ) ), this, SLOT ( slotItemChanged () ) ); @@ -193,7 +196,7 @@ item->setSelected( true ); if ( hasMultiSelection() ) - item->setCheckState( 0, Qt::Checked ); + item->setCheckState( 0, Qt::Checked ); if ( item->parent() ) openBranch( (YQTreeItem *) item->parent() ); @@ -259,9 +262,20 @@ { if ( notify() && ! YQUI::ui()->eventPendingFor( this ) ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); + } +void YQTree::slotItemClicked( QTreeWidgetItem * item, int column ) +{ + _qt_treeWidget->setCurrentItem( item ); + + if ( notify() && ! YQUI::ui()->eventPendingFor( this ) ) + YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) ); +} + + + void YQTree::slotSelectionChanged( ) { @@ -279,7 +293,7 @@ else treeItem->origItem()->setSelected( false ); } - ++it; + ++it; } } else @@ -358,6 +372,26 @@ YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ContextMenuActivated ) ); } + +YTreeItem * +YQTree::currentItem() +{ + + QTreeWidgetItem * currentQItem = _qt_treeWidget->currentItem(); + + if ( currentQItem ) + { + YQTreeItem * item = dynamic_cast<YQTreeItem *> (currentQItem); + + if ( item ) + return item->origItem(); + } + + return 0; +} + + + /*============================================================================*/ Modified: trunk/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.h?rev=63368&r1=633… ============================================================================== --- trunk/qt/src/YQTree.h (original) +++ trunk/qt/src/YQTree.h Tue Feb 8 12:18:40 2011 @@ -105,6 +105,7 @@ **/ virtual void deleteAllItems(); + /** * Set enabled/disbled state. * @@ -139,6 +140,16 @@ virtual bool setKeyboardFocus(); + /** + * Return the the item that currently has the keyboard focus + * or 0 if no item currently has the keyboard focus. + * + * Reimplemented from YMultiSelectionBox. + **/ + virtual YTreeItem * currentItem(); + + + protected slots: @@ -156,6 +167,10 @@ * This will trigger a 'ValueChanged' event if 'notify' is set. **/ void slotItemChanged(); + void slotItemClicked( QTreeWidgetItem * item, int column ); + + + /** * Propagate a double click or pressing the space key on a tree item. Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=63368&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Tue Feb 8 12:18:40 2011 @@ -20,8 +20,8 @@ Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 #YIconLoader -BuildRequires: yast2-libyui-devel >= 2.20.0 -Requires: yast2-libyui >= 2.20.0 +BuildRequires: yast2-libyui-devel >= 2.20.1 +Requires: yast2-libyui >= 2.20.1 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] r63367 - in /branches/tmp/jsuchome/snapper/src: Snapper.ycp dialogs.ycp
by jsuchome＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: jsuchome Date: Tue Feb 8 11:16:38 2011 New Revision: 63367 URL: http://svn.opensuse.org/viewcvs/yast?rev=63367&view=rev Log: only diff once snapshot is selected Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp branches/tmp/jsuchome/snapper/src/dialogs.ycp Modified: branches/tmp/jsuchome/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Snap… ============================================================================== --- branches/tmp/jsuchome/snapper/src/Snapper.ycp (original) +++ branches/tmp/jsuchome/snapper/src/Snapper.ycp Tue Feb 8 11:16:38 2011 @@ -44,6 +44,9 @@ global map selected_snapshot = $[]; +// index to snapshots list +global integer selected_snapshot_index = 0; + /** * Return list of files modified between given snapshots * File is a map with name (path) and some parameters @@ -108,11 +111,6 @@ integer id = snapshot["num"]:0; if (id == 0) return; // ignore the 'current system' snapshot["name"] = tostring (id); - if (snapshot["type"]:`NONE == `POST) - { - integer pre = snapshot["pre_num"]:0; - snapshot["files"] = ReadModifiedFiles (pre, id); - } y2internal ("snapshot data: %1", snapshot); snapshots = add (snapshots, snapshot); }); Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/dial… ============================================================================== --- branches/tmp/jsuchome/snapper/src/dialogs.ycp (original) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Tue Feb 8 11:16:38 2011 @@ -161,6 +161,7 @@ } else if (ret == `show) { Snapper::selected_snapshot = snapshots[selected]:$[]; + Snapper::selected_snapshot_index = selected; break; } else if(ret == `next) { @@ -195,10 +196,24 @@ list<term> tree_items = []; map open_items = $[]; - list<map> file_list = Snapper::selected_snapshot["files"]:[]; - integer snapshot_num = Snapper::selected_snapshot["num"]:0; + map snapshot = Snapper::selected_snapshot; + integer snapshot_num = snapshot["num"]:0; + list<map> file_list = snapshot["files"]:[]; + + if (!haskey (snapshot, "files")) + { + if (snapshot["type"]:`NONE == `POST) + { + integer pre = snapshot["pre_num"]:0; + snapshot["files"] = Snapper::ReadModifiedFiles (pre, snapshot_num); + file_list = snapshot["files"]:[]; + // update the global snapshots list + Snapper::snapshots[Snapper::selected_snapshot_index] = snapshot; + } + } + // FIXME what to use for previous_num in non-post snapshots? - integer previous_num = Snapper::selected_snapshot["pre_num"]:snapshot_num; + integer previous_num = snapshot["pre_num"]:snapshot_num; string snapshot_name = tostring (snapshot_num); map<string,map> tree_map = $[]; @@ -339,7 +354,7 @@ ) ))), `HWeight (2, `VBox ( - `Label (`id (`label), Snapper::selected_snapshot["description"]:""), + `Label (`id (`label), snapshot["description"]:""), `Frame ("", `HBox ( `HSpacing (0.5), `VBox ( `VSpacing (0.5), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63366 - /trunk/ncurses/src/NCMultiSelectionBox.cc
by gs＠svn2.opensuse.org 08 Feb '11

08 Feb '11

Author: gs Date: Tue Feb 8 10:03:04 2011 New Revision: 63366 URL: http://svn.opensuse.org/viewcvs/yast?rev=63366&view=rev Log: check item pointer in setCurrentItem Modified: trunk/ncurses/src/NCMultiSelectionBox.cc Modified: trunk/ncurses/src/NCMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMultiSelectionBox.… ============================================================================== --- trunk/ncurses/src/NCMultiSelectionBox.cc (original) +++ trunk/ncurses/src/NCMultiSelectionBox.cc Tue Feb 8 10:03:04 2011 @@ -78,7 +78,8 @@ void NCMultiSelectionBox::setCurrentItem( YItem * item ) { - myPad()->ScrlLine( item->index() ); + if ( item ) + myPad()->ScrlLine( item->index() ); } void NCMultiSelectionBox::addItem( YItem * item ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0