February 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63465 - in /trunk/ncurses/src: NCTree.cc NCTree.h
by gs＠svn2.opensuse.org 24 Feb '11

24 Feb '11

Author: gs Date: Thu Feb 24 13:10:19 2011 New Revision: 63465 URL: http://svn.opensuse.org/viewcvs/yast?rev=63465&view=rev Log: deselectAllItems added (bug-fix for bnc#673801) Modified: trunk/ncurses/src/NCTree.cc trunk/ncurses/src/NCTree.h Modified: trunk/ncurses/src/NCTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTree.cc?rev=63465&… ============================================================================== --- trunk/ncurses/src/NCTree.cc (original) +++ trunk/ncurses/src/NCTree.cc Thu Feb 24 13:10:19 2011 @@ -344,7 +344,20 @@ return yitem; } +void NCTree::deselectAllItems() +{ + if ( multiSel) + { + YItemCollection selectedItems = YTree::selectedItems(); + + for ( YItemConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) + { + selectItem( *it, false ); + } + } + YTree::deselectAllItems(); +} // Set current item (under the cursor) to selected @@ -352,7 +365,7 @@ { if ( !myPad() ) return; - + YTreeItem * treeItem = dynamic_cast<YTreeItem *>( item ); YUI_CHECK_PTR( treeItem ); YTreeItem *citem = getCurrentItem(); @@ -372,9 +385,9 @@ } } - if ( !selected && ( treeItem == citem ) ) + if ( !selected ) { - if ( !multiSel ) + if ( !multiSel && (treeItem == citem) ) { YTree::deselectAllItems(); } @@ -483,7 +496,7 @@ { if ( !myPad() ) { - yuiWarning() << "PadWidget not valid" << endl; + yuiWarning() << "PadWidget not yet created" << endl; return; } Modified: trunk/ncurses/src/NCTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTree.h?rev=63465&r… ============================================================================== --- trunk/ncurses/src/NCTree.h (original) +++ trunk/ncurses/src/NCTree.h Thu Feb 24 13:10:19 2011 @@ -74,6 +74,8 @@ virtual YTreeItem * getCurrentItem() const; virtual YTreeItem * currentItem(); + + virtual void deselectAllItems(); virtual void selectItem( YItem *item, bool selected ); virtual void selectItem( int index ); -- 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] r63464 - in /branches/tmp/jsuchome/snapper/src: dialogs.ycp helps.ycp
by jsuchome＠svn2.opensuse.org 24 Feb '11

24 Feb '11

Author: jsuchome Date: Thu Feb 24 11:01:57 2011 New Revision: 63464 URL: http://svn.opensuse.org/viewcvs/yast?rev=63464&view=rev Log: help texts, 2 restore buttons for snapshot couple Modified: branches/tmp/jsuchome/snapper/src/dialogs.ycp branches/tmp/jsuchome/snapper/src/helps.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 Thu Feb 24 11:01:57 2011 @@ -70,7 +70,6 @@ integer i = -1; list snapshot_items = []; -// list coupled_snapshot_items = []; foreach (map s, snapshots, { i = i + 1; @@ -106,25 +105,8 @@ }); term contents = `VBox ( - /* - // table label - `Left (`Label (_("Single Snapshots"))), - `Table (`id (`single_snapshots_table), `opt(`notify, `keepSorting), `header ( - // table header - _("Date"), _("Number"), _("Description")), - single_snapshot_items - ), - `HBox ( - `PushButton (`id (`show_s), _("Show Changes")), - `HStretch () - ), - `VSpacing (0.5), - // table label - `Left (`Label (_("Coupled Snapshots"))), - */ `Table (`id (`snapshots_table), `opt(`notify, `keepSorting), `header ( // table header -// _("Pre ID"), _("Start Date"), _("Post ID"), _("End Date"), _("Description")), _("ID"), _("Type"), _("Start Date"), _("End Date"), _("Description")), snapshot_items ), @@ -140,10 +122,6 @@ Wizard::HideAbortButton (); UI::SetFocus (`id (`snapshots_table)); - /* - if (coupled_snapshot_items == [] && single_snapshot_items != []) - UI::SetFocus (`id (`single_snapshots_table)); - */ any ret = nil; while(true) { @@ -152,16 +130,6 @@ integer selected = 0; - /* - if (ret == `single_snapshots_table || ret == `coupled_snapshots_table) { - selected = (integer) UI::QueryWidget (`id (ret), `CurrentItem); - ret = `show; - } - if (ret == `show_s) { - selected = (integer) UI::QueryWidget (`id (`single_snapshots_table), `CurrentItem); - ret = `show; - } - */ if (ret == `show_c || ret == `snapshots_table) { selected = (integer) UI::QueryWidget (`id (`snapshots_table), `CurrentItem); ret = `show; @@ -233,7 +201,10 @@ { to = snapshot["post_num"]:0; } + // busy popup message + Popup::ShowFeedback ("", _("Calculating changed files...")); snapshot["files"] = Snapper::ReadModifiedFiles (from, to); + Popup::ClearFeedback (); file_list = snapshot["files"]:[]; // update the global snapshots list Snapper::snapshots[Snapper::selected_snapshot_index] = snapshot; @@ -341,8 +312,12 @@ } UI::ReplaceWidget (`id (`diff_content), `HBox (`HSpacing (0.5), `VBox ( content, - // button label - `VSquash (`Right (`PushButton (`id (`restore), _("Restore")))) + `VSquash (`HBox ( + `HStretch (), + type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), _("Restore From First")), + // button label + `PushButton (`id (`restore), type == `SINGLE ? _("Restore") : _("Restore From Second")) + )) ), `HSpacing (0.5)) ); } @@ -435,7 +410,8 @@ ); // show the dialog contents with empty tree, compute items later - Wizard::SetContentsButtons (caption, contents, HELPS["show"]:"", + Wizard::SetContentsButtons (caption, contents, + type == `SINGLE ? HELPS["show_single"]:"" : HELPS["show_couple"]:"", // button label Label::CancelButton(), _("Restore Selected")); @@ -550,12 +526,27 @@ else if (ret == `abort || ret == `cancel || ret == `back) { break; } + else if (ret == `restore_pre) { + // yes/no question, %1 is file name, %2 is number + if (Popup::YesNo (sformat ("Do you want to copy the file + +%1 + +from snapshot '%2' to current system?", current_file, previous_num))) + { + Snapper::RestoreFiles (previous_num, [current_file]); + } + continue; + } else if (ret == `restore) { - if (Popup::YesNo (sformat ("Do you want to copy the file '%1' from snapshot '%2' to current system? + // yes/no question, %1 is file name, %2 is number + if (Popup::YesNo (sformat ("Do you want to copy the file + +%1 -This will probably break your system. Are you sure?", current_file, snapshot_name))) +from snapshot '%2' to current system?", current_file, snapshot_num))) { - y2milestone ("restoring file %1...", current_file); + Snapper::RestoreFiles (snapshot_num, [current_file]); } continue; } @@ -575,7 +566,7 @@ // popup headline if (Popup::AnyQuestionRichText (_("Restoring files"), // popup message, %1 is snapshot number, %2 list of files - sformat (_("These files will be copied from snapshot %1 to current system:%2Are you sure?"), + sformat (_("These files will be copied from snapshot '%1' to current system: %2Are you sure?"), previous_num, mergestring (files, " ")), 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { Modified: branches/tmp/jsuchome/snapper/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/help… ============================================================================== --- branches/tmp/jsuchome/snapper/src/helps.ycp (original) +++ branches/tmp/jsuchome/snapper/src/helps.ycp Thu Feb 24 11:01:57 2011 @@ -36,24 +36,34 @@ */ map HELPS = $[ - /* Read dialog help 1/2 */ - "read" : _("<big>Initializing snapper Configuration</big> -Please wait... -"), - /* Write dialog help 1/2 */ - "write" : _("<big>Saving snapper Configuration</big> + /* Read dialog help */ + "read" : _("<big>Reading the list of snapshots</big> Please wait... "), - /* Summary dialog help 1/3 */ - "summary" : _("<big>Snapper Configuration</big> -Configure snapper here. + /* Summary dialog help: */ + "summary" : _("<big>Snapshots Configuration</big> +The table shows a list of root filesystem snapshots. There are three types of snapshots, single, pre and post. Single snapshots are used for storing file system state in certain time, while Pre and Post are used to define the changes done by special operation proceeded between taking those two snapshots. Pre and Post snapshots are coupled together in the table. +Select a snapshot or snapshot couple and click Show Changes to see the file system changes new in specified snapshot. "), - /* Add dialog help */ - "add" : _("<big>Creating new snapshot</big> -Press Next to continue. - "), + /* Show snapshot dialog help */ + "show_couple" : _("<big>Snapshot Overview</big> + +The tree shows all the files that were modified between creating first ('pre') and second ('post') snapshot. On the right side, you can see the description generated when the first snapshot was created and the time of creation for both snapshots. + + +When file is selected in the tree, you can see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions. +"), + + /* Show snapshot dialog help, alternative for single snapshots */ + "show_single" : _("<big>Snapshot Overview</big> + +The tree shows all the files that are different between selected snapshot and current system. On the right side, you can see the snapshot description and time of its creation. + + +When file is selected in the tree, you can see the its difference between snapshot version and current system. +"), ]; -- 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] r63463 - /branches/tmp/jsuchome/snapper/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 23 Feb '11

23 Feb '11

Author: jsuchome Date: Wed Feb 23 15:10:43 2011 New Revision: 63463 URL: http://svn.opensuse.org/viewcvs/yast?rev=63463&view=rev Log: implement tree handling (checking/unchecking of subtrees) in YCP... :-( 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 Wed Feb 23 15:10:43 2011 @@ -240,12 +240,16 @@ } string snapshot_name = tostring (snapshot_num); + + // map of tree (recursive) map<string,map> tree_map = $[]; + // map of all items in tree (just one level) + map<string,boolean> selected_items = $[]; + // helper function: update the global map with directory tree structure map<string,map> update_tree_map (map<string,map> current_map, list<string> path_list) { - y2internal ("current path list: %1", path_list); string first = path_list[0]:""; if (current_map[first]:nil == nil) @@ -480,22 +484,46 @@ // non-tracked file (so, it should be directory) if (current_file != "" && files_index[current_file]:$[] == $[]) { -y2internal ("event: %1", event); - // FIXME not possible to uncheck an item... - integer len = size (current_file); - list<string> sel= []; - foreach (string key, map m, files_index, { - // FIXME this could get too slow... build a structure while creating items? - if (substring (key, 0, len) == current_file) + void select_items (map<string,map> current_map, string prefix) { + selected_items[prefix] = ! selected_items[prefix]:false; + foreach (string key, map submap, current_map, { + string new_path = prefix + "/" + key; + if (submap != $[]) + { + select_items ((map<string,map>) submap, new_path); + } + else + { + selected_items[new_path] = ! selected_items[new_path]:false; + } + }); + } + void update_selection (map<string,map> current_map, list<string> path_list) + { + string first = path_list[0]:""; + if (size (path_list) == 0) { - y2security ("select '%1'", key); - sel = add (sel, key); + select_items (current_map, current_file); + } + else if (haskey (current_map, first)) + { + update_selection ((map<string,map>)current_map[first]:$[], + (list<string>) remove (path_list, 0) + ); } - }); - if (sel != []) - { - UI::ChangeWidget (`tree, `SelectedItems, sel); } + list<string> path_l = splitstring (current_file, "/"); + if (path_l[0]:"" == "") + path_l = remove (path_l, 0); + + update_selection (tree_map, path_l); + + list<string> selection = []; + foreach (string key, boolean val, selected_items, { + if (val) + selection = add (selection, key); + }); + UI::ChangeWidget (`tree, `SelectedItems, selection); } } -- 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] r63462 - /trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp
by gs＠svn2.opensuse.org 23 Feb '11

23 Feb '11

Author: gs Date: Wed Feb 23 14:30:22 2011 New Revision: 63462 URL: http://svn.opensuse.org/viewcvs/yast?rev=63462&view=rev Log: improve example Modified: trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp Modified: trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/MultiSe… ============================================================================== --- trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp (original) +++ trunk/ycp-ui-bindings/examples/MultiSelectionBox4.ycp Wed Feb 23 14:30:22 2011 @@ -10,7 +10,7 @@ term contents = `HBox (`VSpacing (20), `VBox (`HSpacing(70), `VSpacing (0.2), - `MultiSelectionBox (`id(`tree), `opt(`notify), "tree", items), + `MultiSelectionBox (`id(`multisel), `opt(`notify), "Multiselection", items), `HBox ( `PushButton (`id (`ok), `opt (`default), Label::OKButton()), `PushButton(`id (`cancel), `opt (`key_F9), Label::CancelButton()) @@ -19,21 +19,28 @@ )); UI::OpenDialog (`opt (`decorated), contents); - UI::ChangeWidget (`tree, `CurrentItem, nil); + UI::ChangeWidget (`multisel, `CurrentItem, nil); + + UI::ChangeWidget(`multisel, `SelectedItems, ["a", "x" ] ); + UI::ChangeWidget(`multisel, `SelectedItems, ["y", "z" ] ); + + list selected_items = (list) UI::QueryWidget( `id(`multisel), `SelectedItems ); + y2milestone( "Selected items: %1", selected_items ); + y2milestone( "Current item: %1", (string) UI::QueryWidget (`id(`multisel),`CurrentItem)); while (true) { map event = UI::WaitForEvent (); any ret = event["ID"]:nil; - if (ret == `tree) + if (ret == `multisel) { - string current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + string current = (string) UI::QueryWidget (`id(`multisel),`CurrentItem); y2internal ("current: %1", current); } if (ret == `ok || ret == `cancel) break; } - string current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + string current = (string) UI::QueryWidget (`id(`multisel),`CurrentItem); y2internal ("current before leaving: %1", current ); 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] r63461 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes src/CMakeLists.txt src/listview.h src/main_window.cpp src/main_window.h
by tgoettlicher＠svn2.opensuse.org 23 Feb '11

23 Feb '11

Author: tgoettlicher Date: Wed Feb 23 13:07:45 2011 New Revision: 63461 URL: http://svn.opensuse.org/viewcvs/yast?rev=63461&view=rev Log: - remember panel width (bnc #613352) - 2.20.2 Added: trunk/control-center/src/listview.h Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/CMakeLists.txt trunk/control-center/src/main_window.cpp trunk/control-center/src/main_window.h Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Wed Feb 23 13:07:45 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Wed Feb 23 13:07:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 23 13:06:01 CET 2011 - tgoettlicher(a)suse.de + +- remember panel width (bnc #613352) +- 2.20.2 + +------------------------------------------------------------------- Tue Feb 22 17:36:58 CET 2011 - tgoettlicher(a)suse.de - fixed bnc #650907: yast2 shrinks module selector item on search Modified: trunk/control-center/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/CMakeLists.tx… ============================================================================== --- trunk/control-center/src/CMakeLists.txt (original) +++ trunk/control-center/src/CMakeLists.txt Wed Feb 23 13:07:45 2011 @@ -17,22 +17,15 @@ main.cpp main_window.cpp kcategorizedview.cpp - # menuitem.cpp kcategorydrawer.cpp kcategorizedsortfilterproxymodel.cpp - # kcmodulemodel.cpp moduleiconitem.cpp - # kcmoduleinfo.cpp - yccmoduleinfoprovider.cpp - yqdesktopfilesmodel.cpp yqmodulegroupsmodel.cpp yqmodulesmodel.cpp yqmodulesproxymodel.cpp - yqsavelogs.cpp - i18n.cpp ) @@ -43,23 +36,17 @@ SET(yast2-control-center_HDRS main_window.h kcategorizedview.h - # menuitem.h - # kcmodulemodel.h kcategorydrawer.h kcategorizedsortfilterproxymodel.h moduleiconitem.h - # kcmoduleinfo.h kcategorizedview_p.h - yccmoduleinfoprovider.h - yqdesktopfilesmodel.h yqmodulegroupsmodel.h yqmodulesmodel.h yqmodulesproxymodel.h - + listview.h yqsavelogs.h - i18n.h ) Added: trunk/control-center/src/listview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/listview.h?re… ============================================================================== --- trunk/control-center/src/listview.h (added) +++ trunk/control-center/src/listview.h Wed Feb 23 13:07:45 2011 @@ -0,0 +1,13 @@ +#include <QtGui> + +class ListView : public QListView +{ +public: + ListView() : QListView() { mySize = QSize(42,42); } + + QSize sizeHint() const { return mySize; } + void setSizeHint( QSize s ) { mySize = s; } + +private: + QSize mySize; +}; Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.c… ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Wed Feb 23 13:07:45 2011 @@ -38,12 +38,15 @@ #include "yqmodulesmodel.h" #include "yqmodulegroupsmodel.h" +#include "listview.h" //#include "moduleiconitem.h" #define ORG_NAME "YaST2" #define APP_NAME "y2controlcenter-qt" #define USED_QUEUE_SIZE 5 +#define GROUPSIZE QSize(200,350) + /* Textdomain "control-center" @@ -67,7 +70,7 @@ } YQModulesModel *modmodel; - QListView *groupview; + ListView *groupview; KCategorizedView * modview; // category proxy model KCategorizedSortFilterProxyModel * kcsfpm; @@ -144,9 +147,11 @@ d->gcsfpm->setFilterKeyColumn( 2 ); d->gcsfpm->setFilterRole( Qt::UserRole ); - d->groupview = new QListView( ); + d->groupview = new ListView( ); + d->groupview->setModel(d->gcsfpm); d->groupview->setIconSize( QSize(32,32) ); + d->groupview->setSizeHint( readGroupViewSize() ); //now pre-select something d->groupview->setSelectionMode( QAbstractItemView::SingleSelection ); @@ -192,6 +197,8 @@ connect( logSaver, SIGNAL( statusMsg( const QString &)), statusBar(), SLOT( showMessage( const QString &) )); + +// d->groupview->setSizeHint(500,500); } void MainWindow::setFullScreen( bool fs ) @@ -348,6 +355,19 @@ } +QSize MainWindow::readGroupViewSize() +{ + QSettings settings(ORG_NAME, APP_NAME); + QSize size; + + settings.beginGroup("GroupView"); + size = settings.value("Size", GROUPSIZE).toSize(); + settings.endGroup(); + + return size; +} + + void MainWindow::writeSettings() { QSettings settings(ORG_NAME, APP_NAME); @@ -361,6 +381,11 @@ QStringList used_list( d->recentlyUsed ); settings.setValue( "RecentlyUsed", used_list.join(",") ); settings.endGroup(); + + settings.beginGroup("GroupView"); + settings.setValue("Size", d->groupview->size()); + settings.endGroup(); + } void MainWindow::setWinTitle() Modified: trunk/control-center/src/main_window.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.h… ============================================================================== --- trunk/control-center/src/main_window.h (original) +++ trunk/control-center/src/main_window.h Wed Feb 23 13:07:45 2011 @@ -62,6 +62,9 @@ void writeSettings(); void readSettings(); void setWinTitle(); + QSize readGroupViewSize(); + + QDockWidget *groupdock; }; -- 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] r63460 - /trunk/yast2/scripts/yast2
by aschnell＠svn2.opensuse.org 23 Feb '11

23 Feb '11

Author: aschnell Date: Wed Feb 23 12:41:57 2011 New Revision: 63460 URL: http://svn.opensuse.org/viewcvs/yast?rev=63460&view=rev Log: - added cleanup option to snapper calls Modified: trunk/yast2/scripts/yast2 Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=63460&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Wed Feb 23 12:41:57 2011 @@ -215,7 +215,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --print-number --description="yast $1"` + SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --cleanup=amount --print-number --description="yast $1"` fi fi } @@ -224,7 +224,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - $SNAPPERBIN create --type=post --pre-number=$SNAPSHOT_NUMBER + $SNAPPERBIN create --type=post --cleanup=amount --pre-number=$SNAPSHOT_NUMBER fi fi } -- 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] r63459 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes src/kcategorizedview.cpp src/moduleiconitem.cpp src/modulesview.cpp src/modulesview.h
by tgoettlicher＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: tgoettlicher Date: Tue Feb 22 17:31:20 2011 New Revision: 63459 URL: http://svn.opensuse.org/viewcvs/yast?rev=63459&view=rev Log: fixed bnc #650907: yast2 shrinks module selector item on search clean-up Removed: trunk/control-center/src/modulesview.cpp trunk/control-center/src/modulesview.h Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/kcategorizedview.cpp trunk/control-center/src/moduleiconitem.cpp Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Tue Feb 22 17:31:20 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "20") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Tue Feb 22 17:31:20 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 22 17:36:58 CET 2011 - tgoettlicher(a)suse.de + +- fixed bnc #650907: yast2 shrinks module selector item on search +- 2.20.1 + +------------------------------------------------------------------- Tue Feb 22 14:20:36 CET 2011 - tgoettlicher(a)suse.de - bnc #661109: Layout of icons gets mixed after using search Modified: trunk/control-center/src/kcategorizedview.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizedv… ============================================================================== --- trunk/control-center/src/kcategorizedview.cpp (original) +++ trunk/control-center/src/kcategorizedview.cpp Tue Feb 22 17:31:20 2011 @@ -27,6 +27,7 @@ #include <QScrollBar> #include <QPaintEvent> #include <QDebug> +#include <iostream> #include "kcategorydrawer.h" @@ -174,10 +175,12 @@ int itemWidthPlusSeparation = listView->spacing() + itemWidth; if (!itemWidthPlusSeparation) itemWidthPlusSeparation++; + int elementsPerRow = viewportWidth / itemWidthPlusSeparation; if (!elementsPerRow) elementsPerRow++; + int column; int row; Modified: trunk/control-center/src/moduleiconitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/moduleiconite… ============================================================================== --- trunk/control-center/src/moduleiconitem.cpp (original) +++ trunk/control-center/src/moduleiconitem.cpp Tue Feb 22 17:31:20 2011 @@ -20,8 +20,6 @@ */ #include "moduleiconitem.h" -//#include <kiconloader.h> -//#include <kdebug.h> #include "kcmoduleinfo.h" #include <climits> @@ -88,9 +86,6 @@ } painter->setFont( f ); -// if( index.data( Qt::UserRole ).toInt() == KIconLoader::DisabledState ) { -// painter->setPen( option.palette.color( QPalette::Disabled, QPalette::Text ) ); -// } QIcon::Mode iconMode = QIcon::Normal; if (selected) iconMode = QIcon::Selected; @@ -114,8 +109,8 @@ QFontMetrics fm( f ); QSize s = QItemDelegate::sizeHint( option, index ); - int w = lviewstyle->pixelMetric( QStyle::PM_FocusFrameHMargin ) + 2*lviewstyle->pixelMetric( QStyle::PM_ListViewIconSize ) + - + fm.boundingRect( text ).width(); + int w = 2*lviewstyle->pixelMetric( QStyle::PM_FocusFrameHMargin ) + 2*lviewstyle->pixelMetric( QStyle::PM_ListViewIconSize ) + 8 + fm.boundingRect( text ).width(); + return QSize( w, s.height()); } @@ -137,42 +132,4 @@ return path; } -/*ModuleIconItem::ModuleIconItem( QListWidget* parent, const KCModuleInfo& module) - :// QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent), - imageName(module.icon()) -{ - - std::cout << "ModuleIconItem::ModuleIconItem" << std::endl; -// setData( Qt::UserRole, KIconLoader::DefaultState ); - modules.append(module); - setSize(); -} - -ModuleIconItem::ModuleIconItem( QListWidget* parent, const QString &text, - const QString &_imageName ) - : //QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ), - imageName(_imageName) -{ - std::cout << "ModuleIconItem::ModuleIconItem" << std::endl; -// setData( Qt::UserRole, KIconLoader::DefaultState ); - setSize(); -} - -void ModuleIconItem::loadIcon( bool enabled ) -{ - std::cout << "ModuleIconItem::loadIcon" << std::endl; -// int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState; -// if( newState == data( Qt::UserRole ).toInt() ) - return; - -// setData( Qt::UserRole, newState ); -// setIcon( DesktopIcon( imageName, IMAGE_SIZE , newState ) ); -} -void ModuleIconItem::setSize() -{ - QStyle *style = listWidget()->style(); - QFontMetrics fm(font()); - const QRect &rect = fm.boundingRect(0, 0, ICON_WIDTH, INT_MAX, Qt::TextWordWrap, text()); - setData(Qt::SizeHintRole, QSize(ICON_WIDTH, IMAGE_SIZE + style->pixelMetric(QStyle::PM_FocusFrameVMargin) + rect.height())); -}*/ -- 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] r63458 - /trunk/libyui-bindings/swig/perl/examples/twitter.pl
by mvidner＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: mvidner Date: Tue Feb 22 14:46:58 2011 New Revision: 63458 URL: http://svn.opensuse.org/viewcvs/yast?rev=63458&view=rev Log: A simple dialog that posts to Twitter. Written by Bubli for her Linux Tag 2010 talk: http://www.linuxtag.org/2010/en/program/free-conference/popup/details-talki… Added: trunk/libyui-bindings/swig/perl/examples/twitter.pl Added: trunk/libyui-bindings/swig/perl/examples/twitter.pl URL: http://svn.opensuse.org/viewcvs/yast/trunk/libyui-bindings/swig/perl/exampl… ============================================================================== --- trunk/libyui-bindings/swig/perl/examples/twitter.pl (added) +++ trunk/libyui-bindings/swig/perl/examples/twitter.pl Tue Feb 22 14:46:58 2011 @@ -0,0 +1,115 @@ +#!/usr/bin/perl + +use yui; +use Data::Dumper; +use Net::Twitter::Lite; + +my $nt; +my $factory = yui::YUI::widgetFactory; + +sub login { + my $username = shift; + my $password = shift; + + $nt = Net::Twitter::Lite->new( + username => $username, + password => $password, + ); +} + +sub post { + my $newdialog = $factory->createPopupDialog; + + my $min = $factory->createMinWidth($newdialog, 45); + my $vvbox = $factory->createVBox( $min ); + my $textbox = $factory->createMultiLineEdit($vvbox, "What's up?"); + + my $hbox = $factory->createHBox( $vvbox ); + + my $left = $factory->createLeft( $hbox ); + my $statuslabel = $factory->createLabel($left, "Ready ..."); + my $right = $factory->createRight( $hbox ); + my $update = $factory->createPushButton( $right, "Post Update..." ); + my $cruft = $factory->createVSpacing($vvbox, 1); + my $cancel = $factory->createPushButton( $vvbox, "Quit" ); + + while ( 1 ) { + $event = $newdialog->waitForEvent(); + + if ( not event) { + next + } + + # break the loop, quit + + if ($event->widget() == $cancel ) { + last; + } + + # post an update + + if ($event->widget() == $update ) { + my $text = $textbox->value(); + eval { $nt->update($text) }; + + if ( $@ ) { + $statuslabel->setValue( "Update failed!" ); + } + else { + $statuslabel->setValue( "Update OK :)"); + $textbox->setValue(""); + } + next; + } + } + # clean up + $newdialog->destroy(); +} + +my $dialog = $factory->createPopupDialog; + +#################################################### +# # +# dialog # +# vbox # +# label # +# input field # +# passwd field # +# spacing # +# hbox # +# pushbutton # +# pushbutton # +# # +#################################################### + +my $vbox = $factory->createVBox( $dialog ); +my $label = $factory->createLabel( $vbox, "Login to your Twitter account"); +my $username = $factory->createInputField($vbox, "User"); +$username->setStretchable( $yui::YD_HORIZ, 1 ); +my $pass = $factory->createPasswordField($vbox,"Password"); +$pass->setStretchable( $yui::YD_HORIZ, 1 ); + +my $fillup = $factory->createVSpacing($vbox, 1); +my $buttonbox = $factory->createHBox( $vbox ); +my $cancel = $factory->createPushButton( $buttonbox, "Cancel" ); +my $login = $factory->createPushButton( $buttonbox, "Login" ); + +while ( 1 ) { + $event = $dialog->waitForEvent(); + if ( not event ) { + next + } + + if ($event->widget() == $cancel ) { + $dialog->destroy(); + last; + } + + if ($event->widget() == $login ) { + login( $username->value(), $pass->value() ); + $dialog->destroy(); + post; + last; + } +} + -- 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] r63457 - in /trunk/control-center: ./ package/ src/ src/kde/
by tgoettlicher＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: tgoettlicher Date: Tue Feb 22 14:14:59 2011 New Revision: 63457 URL: http://svn.opensuse.org/viewcvs/yast?rev=63457&view=rev Log: - bnc #661109: Layout of icons gets mixed after using search - 2.20.0 Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp trunk/control-center/src/kcategorizedsortfilterproxymodel.h trunk/control-center/src/kde/CMakeLists.txt trunk/control-center/src/main_window.cpp Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Tue Feb 22 14:14:59 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "19") -SET(VERSION_PATCH "3") +SET(VERSION_MINOR "20") +SET(VERSION_PATCH "0") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Tue Feb 22 14:14:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 22 14:20:36 CET 2011 - tgoettlicher(a)suse.de + +- bnc #661109: Layout of icons gets mixed after using search +- 2.20.0 + +------------------------------------------------------------------- Mon Oct 11 11:17:55 CEST 2010 - tgoettlicher(a)suse.de - Adapted license format Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizeds… ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.cpp Tue Feb 22 14:14:59 2011 @@ -323,11 +323,13 @@ return ( nameMatches || keywordMatches ); } -void KCategorizedSortFilterProxyModel::bublisFilterFunction( const QString &s ) +void KCategorizedSortFilterProxyModel::customFilterFunction( const QString &s ) { d->filterGroups.clear(); setFilterFixedString( s ); d->filterString = s; + invalidateFilter(); + invalidate(); } QString KCategorizedSortFilterProxyModel::matchingGroupFilterRegexp() Modified: trunk/control-center/src/kcategorizedsortfilterproxymodel.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kcategorizeds… ============================================================================== --- trunk/control-center/src/kcategorizedsortfilterproxymodel.h (original) +++ trunk/control-center/src/kcategorizedsortfilterproxymodel.h Tue Feb 22 14:14:59 2011 @@ -116,7 +116,7 @@ */ static int naturalCompare(const QString &a, const QString &b); - void bublisFilterFunction( const QString &s ); + void customFilterFunction( const QString &s ); QString matchingGroupFilterRegexp(); Modified: trunk/control-center/src/kde/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/kde/CMakeList… ============================================================================== --- trunk/control-center/src/kde/CMakeLists.txt (original) +++ trunk/control-center/src/kde/CMakeLists.txt Tue Feb 22 14:14:59 2011 @@ -10,4 +10,4 @@ ########### install files ############### install( FILES kcmyast.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) +#install( FILES emoticons.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.c… ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Tue Feb 22 14:14:59 2011 @@ -309,7 +309,7 @@ void MainWindow::slotFilterChanged() { QString stext = d->searchField->text(); - d->kcsfpm->bublisFilterFunction( stext ); + d->kcsfpm->customFilterFunction( stext ); QString gr_filter = d->kcsfpm->matchingGroupFilterRegexp(); d->gcsfpm->setFilterRegExp ( gr_filter ); -- 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] r63456 - /tags/stable-2_20_1/bootloader/
by jreidinger＠svn2.opensuse.org 22 Feb '11

22 Feb '11

Author: jreidinger Date: Tue Feb 22 12:31:08 2011 New Revision: 63456 URL: http://svn.opensuse.org/viewcvs/yast?rev=63456&view=rev Log: Created tag stable-2_20_1 for bootloader Added: tags/stable-2_20_1/bootloader/ (props changed) - copied from r63455, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0