February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63405 - /trunk/gtk/src/YGTreeView.cc
by rpmcruz＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: rpmcruz Date: Fri Feb 11 16:08:50 2011 New Revision: 63405 URL: http://svn.opensuse.org/viewcvs/yast?rev=63405&view=rev Log: Ups. Modified: trunk/gtk/src/YGTreeView.cc Modified: trunk/gtk/src/YGTreeView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTreeView.cc?rev=63405&… ============================================================================== --- trunk/gtk/src/YGTreeView.cc (original) +++ trunk/gtk/src/YGTreeView.cc Fri Feb 11 16:08:50 2011 @@ -120,7 +120,6 @@ gtk_box_pack_start (GTK_BOX (YGWidget::getWidget()), hbox, FALSE, TRUE, 0); gtk_widget_show_all (hbox); } -#endif } void syncCount() -- 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] r63404 - /tags/stable-2_21_92/gtk/
by rpmcruz＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: rpmcruz Date: Fri Feb 11 16:07:59 2011 New Revision: 63404 URL: http://svn.opensuse.org/viewcvs/yast?rev=63404&view=rev Log: Created tag stable-2_21_92 for gtk Added: tags/stable-2_21_92/gtk/ - copied from r63403, trunk/gtk/ -- 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] r63403 - /tags/stable-2_21_92/
by rpmcruz＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: rpmcruz Date: Fri Feb 11 16:07:51 2011 New Revision: 63403 URL: http://svn.opensuse.org/viewcvs/yast?rev=63403&view=rev Log: Created tag stable-2_21_92 Added: tags/stable-2_21_92/ -- 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] r63402 - in /trunk/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: rpmcruz Date: Fri Feb 11 16:07:33 2011 New Revision: 63402 URL: http://svn.opensuse.org/viewcvs/yast?rev=63402&view=rev Log: Milestone version. Modified: trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=63402&r1=63401&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Feb 11 16:07:33 2011 @@ -1 +1 @@ -2.21.91 +2.21.92 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=63402&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Feb 11 16:07:33 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "91") +SET(VERSION_PATCH "92") 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 Fri Feb 11 16:07:33 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 11 15:05:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.92 +- fixed freeze in webpin search tool, and possibly others +(bnc#670625). + +------------------------------------------------------------------- Tue Feb 08 18:28:00 WET 2011 - rpmcruz(a)alunos.dcc.fc.up.pt - 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] r63401 - /trunk/gtk/src/YGTreeView.cc
by rpmcruz＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: rpmcruz Date: Fri Feb 11 16:04:22 2011 New Revision: 63401 URL: http://svn.opensuse.org/viewcvs/yast?rev=63401&view=rev Log: Bug fix 670625 -- webpin freeze Modified: trunk/gtk/src/YGTreeView.cc Modified: trunk/gtk/src/YGTreeView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGTreeView.cc?rev=63401&… ============================================================================== --- trunk/gtk/src/YGTreeView.cc (original) +++ trunk/gtk/src/YGTreeView.cc Fri Feb 11 16:04:22 2011 @@ -14,7 +14,7 @@ #include "YSelectionWidget.h" #include "YGSelectionStore.h" #include "ygtktreeview.h" -#include <YLayoutBox.h> +#include <string.h> /* A generic widget for table related widgets. */ @@ -109,14 +109,7 @@ void addCountWidget (YWidget *yparent) { - bool mainWidget = true; - for (; yparent; yparent->parent()) { - YLayoutBox *box = dynamic_cast <YLayoutBox *> (yparent); - if (box) { - mainWidget = box->primary() == YD_VERT; - break; - } - } + bool mainWidget = !yparent || !strcmp (yparent->widgetClass(), "YVBox") || !strcmp (yparent->widgetClass(), "YReplacePoint"); if (mainWidget) { m_count = gtk_label_new ("0"); GtkWidget *hbox = gtk_hbox_new (FALSE, 4); @@ -127,6 +120,7 @@ gtk_box_pack_start (GTK_BOX (YGWidget::getWidget()), hbox, FALSE, TRUE, 0); gtk_widget_show_all (hbox); } +#endif } void syncCount() -- 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] r63400 - /trunk/ycp-ui-bindings/VERSION
by tgoettlicher＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: tgoettlicher Date: Fri Feb 11 15:57:41 2011 New Revision: 63400 URL: http://svn.opensuse.org/viewcvs/yast?rev=63400&view=rev Log: version Modified: trunk/ycp-ui-bindings/VERSION Modified: trunk/ycp-ui-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=6340… ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Fri Feb 11 15:57:41 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 -- 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] r63399 - /trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes
by tgoettlicher＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: tgoettlicher Date: Fri Feb 11 15:57:29 2011 New Revision: 63399 URL: http://svn.opensuse.org/viewcvs/yast?rev=63399&view=rev Log: - fixed segfault when calling currentItem() - V 2.20.3 Modified: trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes 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 Fri Feb 11 15:57:29 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 11 16:00:40 CET 2011 - tgoettlicher(a)suse.de + +- fixed segfault when calling currentItem() +- V 2.20.3 + +------------------------------------------------------------------- Tue Feb 8 12:17:41 CET 2011 - tgoettlicher(a)suse.de - Added support for currentItem to tree widget -- 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] r63398 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTree.cc yast2-qt.spec.in
by tgoettlicher＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: tgoettlicher Date: Fri Feb 11 14:55:16 2011 New Revision: 63398 URL: http://svn.opensuse.org/viewcvs/yast?rev=63398&view=rev Log: fixed event handling in tree widget Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTree.cc trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63398&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Fri Feb 11 14:55:16 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") 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 Fri Feb 11 14:55:16 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 11 14:57:41 CET 2011 - tgoettlicher(a)suse.de + +- Fixed event handling in tree widget +- V 2.20.2 + +------------------------------------------------------------------- Tue Feb 8 12:20:04 CET 2011 - tgoettlicher(a)suse.de - Added support for currentItem to tree widget Modified: trunk/qt/src/YQTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTree.cc?rev=63398&r1=63… ============================================================================== --- trunk/qt/src/YQTree.cc (original) +++ trunk/qt/src/YQTree.cc Fri Feb 11 14:55:16 2011 @@ -260,25 +260,6 @@ void YQTree::slotItemChanged( ) { - 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( ) -{ if ( hasMultiSelection() ) { QTreeWidgetItemIterator it( _qt_treeWidget); @@ -308,6 +289,27 @@ } + + 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( ) +{ + if ( notify() && ! YQUI::ui()->eventPendingFor( this ) ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::SelectionChanged ) ); } Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=63398&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Fri Feb 11 14:55:16 2011 @@ -20,8 +20,8 @@ Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 #YIconLoader -BuildRequires: yast2-libyui-devel >= 2.20.1 -Requires: yast2-libyui >= 2.20.1 +BuildRequires: yast2-libyui-devel >= 2.20.2 +Requires: yast2-libyui >= 2.20.2 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] r63397 - /branches/tmp/jsuchome/snapper/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: jsuchome Date: Fri Feb 11 11:46:10 2011 New Revision: 63397 URL: http://svn.opensuse.org/viewcvs/yast?rev=63397&view=rev Log: show more info about the snapshot, show 3 possible ways to diff Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp 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 Fri Feb 11 11:46:10 2011 @@ -116,7 +116,7 @@ }); term contents = `VBox ( - // label + // table label `Left (`Label (_("Single Snapshots"))), `Table (`id (`single_snapshots_table), `opt(`notify, `keepSorting), `header ( // table header @@ -128,7 +128,7 @@ `HStretch () ), `VSpacing (0.5), - // label + // table label `Left (`Label (_("Coupled Snapshots"))), `Table (`id (`coupled_snapshots_table), `opt(`notify, `keepSorting), `header ( // table header @@ -215,6 +215,12 @@ map snapshot = Snapper::selected_snapshot; integer snapshot_num = snapshot["num"]:0; list<map> file_list = snapshot["files"]:[]; + integer previous_num = snapshot["pre_num"]:snapshot_num; + + integer pre_index = Snapper::id2index[previous_num]:0; + string description = Snapper::snapshots[pre_index,"description"]:""; + string pre_date = timestring ("%c", Snapper::snapshots[pre_index,"date"]:0, false); + string date = timestring ("%c", snapshot["date"]:0, false); if (!haskey (snapshot, "files")) { @@ -235,7 +241,6 @@ Snapper::snapshots[Snapper::selected_snapshot_index] = snapshot; } - integer previous_num = snapshot["pre_num"]:snapshot_num; string snapshot_name = tostring (snapshot_num); map<string,map> tree_map = $[]; @@ -309,25 +314,31 @@ { if (modification["status"]:"" == "created") { - content = `Left (`Heading ("New file was created")); + // label + content = add (content, `Left (`Heading ("New file was created"))); } else if (modification["status"]:"" == "removed") { - content = `Left (`Heading ("File was removed")); + // label + content = add (content, `Left (`Heading ("File was removed"))); } else if (modification["status"]:"" == "no_change") { - content = `Left (`Heading ("File was not changed")); + // label + content = add (content, `Left (`Heading ("File was not changed"))); } else { y2warning ("not known: %1", modification); } + content = add (content, `VStretch ()); } - UI::ReplaceWidget (`id (`diff_content), `VBox ( + UI::ReplaceWidget (`id (`diff_content), `HBox (`HSpacing (0.5), `VBox ( content, - `Bottom (`Right (`PushButton (`id (`restore), _("Restore")))) - )); + // button label + `VSquash (`Right (`PushButton (`id (`restore), _("Restore")))) + ), `HSpacing (0.5)) + ); } @@ -337,18 +348,21 @@ if (current_file != "" && files_index[current_file]:$[] != $[]) { - UI::ReplaceWidget (`id (`diff_chooser), `VBox ( - `VSpacing (), + UI::ReplaceWidget (`id (`diff_chooser), `HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.2), `RadioButtonGroup (`id(`rd), `Left (`HVSquash (`VBox ( `Left (`RadioButton (`id(`diff_snapshot), `opt (`notify), // radio button label - _("Show what was done when the snapshot was created"), true)), - `Left(`RadioButton (`id (`diff_current), `opt (`notify), + _("Show the difference between first and second snapshot"), true)), + `Left(`RadioButton (`id (`diff_pre_current), `opt (`notify), + // radio button label + _("Show the difference between first snapshot and current system"), false)), + `Left(`RadioButton (`id (`diff_post_current), `opt (`notify), // radio button label - _("Compare file from the snapshot with the current system"), false)) + _("Show the difference between second snapshot and current system"), false)) )))), `VSpacing () - )); + ), `HSpacing (0.5))); show_file_modification (current_file, previous_num, snapshot_num); } else @@ -362,7 +376,11 @@ `HWeight (1, `HBox (`VSpacing (20), `VBox (`HSpacing(70), `HBox ( `HSpacing (), - `ReplacePoint (`id (`reptree), `Tree (`id(`tree), `opt (`notify, `multiSelection), snapshot_name, [])), + `ReplacePoint (`id (`reptree), + `Tree (`id(`tree), `opt (`notify, `multiSelection), + sformat ("%1 - %2", previous_num, snapshot_num), [] + ) + ), `HSpacing () ), `HBox ( @@ -376,7 +394,17 @@ ) ))), `HWeight (2, `VBox ( - `Label (`id (`label), snapshot["description"]:""), + `Left (`Label (`id (`desc), description)), + `HBox ( + // label, date string will follow at the end of line + `Label (`id (`pre_date), _("Time of taking the first snapshot:")), + `Right (`Label (pre_date)) + ), + `HBox ( + // label, date string will follow at the end of line + `Label (`id (`post_date), _("Time of taking the second snapshot:")), + `Right (`Label (date)) + ), `Frame ("", `HBox ( `HSpacing (0.5), `VBox ( `VSpacing (0.5), @@ -411,7 +439,9 @@ if (size (tree_items) > 0) { UI::ReplaceWidget (`id (`reptree), - `Tree (`id(`tree), `opt (`notify, `multiSelection), snapshot_name, tree_items) + `Tree (`id(`tree), `opt (`notify, `multiSelection), + sformat ("%1 - %2", previous_num, snapshot_num), tree_items + ) ); // no item is selected UI::ChangeWidget (`tree, `CurrentItem, nil); @@ -428,15 +458,14 @@ while(true) { map event = UI::WaitForEvent (); -y2internal ("event: %1", event); // FIXME look at ncurses ret = (symbol) event["ID"]:nil; - current_file = (string) UI::QueryWidget (`id(`tree),`CurrentItem); - if (current_file == nil) current_file = ""; - // events in tree if (ret == `tree) { + current_file = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + if (current_file == nil) current_file = ""; + set_entry_term (); UI::NormalCursor (); if (textmode) @@ -446,7 +475,11 @@ { show_file_modification (current_file, previous_num, snapshot_num); } - else if (ret == `diff_current) + else if (ret == `diff_pre_current) + { + show_file_modification (current_file, previous_num, 0); + } + else if (ret == `diff_post_current) { show_file_modification (current_file, snapshot_num, 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] r63396 - in /trunk/libyui: VERSION package/yast2-libyui.changes
by tgoettlicher＠svn2.opensuse.org 11 Feb '11

11 Feb '11

Author: tgoettlicher Date: Fri Feb 11 11:39:12 2011 New Revision: 63396 URL: http://svn.opensuse.org/viewcvs/yast?rev=63396&view=rev Log: fixed sefault on current item Modified: trunk/libyui/VERSION trunk/libyui/package/yast2-libyui.changes Modified: trunk/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui/VERSION?rev=63396&r1=6339… ============================================================================== --- trunk/libyui/VERSION (original) +++ trunk/libyui/VERSION Fri Feb 11 11:39:12 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 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 Fri Feb 11 11:39:12 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 11 11:41:53 CET 2011 - tgoettlicher(a)suse.de + +- Fixed segfault for currentItem on tree widget +- V 2.20.2 + +------------------------------------------------------------------- Tue Feb 8 12:16:30 CET 2011 - tgoettlicher(a)suse.de - Added support for currentItem to tree widget -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0