February 2011 - YaST Commits - openSUSE Mailing Lists

[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

[yast-commit] r63365 - in /branches/tmp/jsuchome/snapper: agent-snapper/src/SnapperAgent.cc src/Snapper.ycp src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 07 Feb '11

07 Feb '11

Author: jsuchome Date: Mon Feb 7 16:26:22 2011 New Revision: 63365 URL: http://svn.opensuse.org/viewcvs/yast?rev=63365&view=rev Log: use agent to read snapshot diffs differentiate between snapshot types Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc branches/tmp/jsuchome/snapper/src/Snapper.ycp branches/tmp/jsuchome/snapper/src/dialogs.ycp Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agent-sn… ============================================================================== --- branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc Mon Feb 7 16:26:22 2011 @@ -161,9 +161,8 @@ for (Files::const_iterator it = files.begin(); it != files.end(); ++it) { YCPMap filemap; - y2internal ("file :%s ", it->getName().c_str ()); - y2internal ("pre to post status: %d", it->getPreToPostStatus()); filemap->add (YCPString ("name"), YCPString (it->getName())); + // FIXME it's PreToPostStatus! filemap->add (YCPString ("changes"), YCPString (statusToString (it->getPreToPostStatus()))); retlist->add (filemap); } 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 Mon Feb 7 16:26:22 2011 @@ -45,42 +45,25 @@ global map selected_snapshot = $[]; /** - * Return list of files modified in current snapshot + * Return list of files modified between given snapshots * File is a map with name (path) and some parameters */ -global list<map> ReadModifiedFiles (string snapshot) { +global list<map> ReadModifiedFiles (integer from, integer to) { - list<map> ret = []; - string dir = snapshots_path + "/" + snapshot; - - if (FileUtils::Exists (dir + "/files.txt")) - { - string files = (string) SCR::Read (.target.string, dir + "/files.txt"); - if (files == nil) files = ""; - foreach (string file, splitstring (files, "\n"), { - if (file == "") return; - list<string> parts = splitstring (file, " \t"); - ret = add (ret, $[ - "name" : parts[1]:"", - "changes" : parts[0]:"" - ]); - }); - } - return ret; + return (list<map>) SCR::Read (.snapper.diff, $[ "from" : from, "to" : to]); } /** - * Describe what was done with given file in given snapshot - FIXME compare arbitrary snapshots - * - when new is "", meaning is 'current system' + * Describe what was done with given file between given snapshots + * - when new is 0, meaning is 'current system' */ -global map GetFileModification (string file, string old, string new) { +global map GetFileModification (string file, integer old, integer new) { map ret = $[]; - string file1 = sformat ("%1/%2%3", snapshots_path, old, file); - string file2 = sformat ("%1/%2%3", snapshots_path, new, file); - if (new == "") + string file1 = sformat ("%1/%2/snapshot/%3", snapshots_path, old, file); + string file2 = sformat ("%1/%2/snapshot/%3", snapshots_path, new, file); + if (new == 0) file2 = file; if (FileUtils::Exists (file1) && FileUtils::Exists (file2)) @@ -119,55 +102,18 @@ global boolean ReadSnapshots () { - /* - map out = (map) SCR::Execute (.target.bash_output, "btrfs subvolume list /"); - - map snapshots_map = $[]; - snapshots = []; - - foreach (string line, splitstring (out["stdout"]:"", "\n"), { - if (line == "") return; - - list<string> l = splitstring (line, " \t"); - string sn_path = l [ size (l) - 1 ]:""; - if (sn_path != "") - sn_path = "/" + sn_path; - - // remove the last part of the path ('post', 'pre') - list<string> pl = splitstring (sn_path, "/"); - pl = remove (pl, size (pl) - 1); - - string name = pl[ size (pl) - 1 ]:""; - if (snapshots_map[name]:false) return; - snapshots_map[name] = true; - map snapshot = $[ - "name" : name - ]; - - string dir = mergestring (pl, "/"); - if (FileUtils::Exists (dir + "/description")) - { - string desc = (string) SCR::Read (.target.string, dir + "/description"); - if (desc == nil) desc = ""; - snapshot["description"] = deletechars(desc, "\n");// FIXME could description have more lines? - } - if (FileUtils::Exists (dir + "/date-pre")) - { - string date = (string) SCR::Read (.target.string, dir + "/date-pre"); - if (date == nil) date = ""; - snapshot["date"] = deletechars (date, "\n"); - } - snapshot["files"] = ReadModifiedFiles (name); - snapshots = add (snapshots, snapshot); - }); - */ - list<map> snapshot_maps = (list<map>) SCR::Read (.snapper.snapshots); foreach (map snapshot, snapshot_maps, { - y2internal ("current snapshot: %1", snapshot); - snapshot["name"] = tostring (snapshot["num"]:0); - // FIXME files are missing... + 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 Mon Feb 7 16:26:22 2011 @@ -78,25 +78,50 @@ list<map> snapshots = Snapper::snapshots; integer i = -1; - list snapshot_items = maplist (map s, snapshots, ``{ - i = i + 1; + list single_snapshot_items = []; + list coupled_snapshot_items = []; + + foreach (map s, snapshots, ``{ + i = i + 1; string date = ""; if (s["num"]:0 != 0) date = timestring("%c", s["date"]:0, false); - return `item (`id (i), date, s["name"]:"", s["description"]:""); + if (s["type"]:`none == `SINGLE) + single_snapshot_items = add (single_snapshot_items, + `item (`id (i), date, s["name"]:"", s["description"]:"")); + else + { + string pre = s["pre_num"]:0 != 0 ? tostring (s["pre_num"]:0) : ""; + coupled_snapshot_items = add (coupled_snapshot_items, + `item (`id (i), date, s["name"]:"", pre, s["description"]:"")); + } }); term contents = `VBox ( - `Table (`id (`snapshots_table), `opt(`notify, `keepSorting), `header ( + // label + `Left (`Label (_("Single Snapshots"))), + `Table (`id (`single_snapshots_table), `opt(`notify, `keepSorting), `header ( // table header _("Date"), _("Number"), _("Description")), - snapshot_items + single_snapshot_items + ), + `HBox ( + `PushButton (`id (`show_s), _("Show Changes")), + `HStretch () + ), + `VSpacing (0.5), + // label + `Left (`Label (_("Coupled Snapshots"))), + `Table (`id (`coupled_snapshots_table), `opt(`notify, `keepSorting), `header ( + // table header + _("Date"), _("Number"), _("Previous"), _("Description")), + coupled_snapshot_items ), `HBox ( - `PushButton (`id (`show), `opt (`default), _("Show Changes")), - `PushButton (`id (`edit), _("Edit Snapshot")), + `PushButton (`id (`show_c), `opt (`default), _("Show Changes")), +// `PushButton (`id (`edit), _("Edit Snapshot")), `HStretch () ) ); @@ -106,22 +131,35 @@ Wizard::HideBackButton (); Wizard::HideAbortButton (); - UI::SetFocus (`id (`snapshots_table)); + UI::SetFocus (`id (`coupled_snapshots_table)); + if (coupled_snapshot_items == [] && single_snapshot_items != []) + UI::SetFocus (`id (`single_snapshots_table)); any ret = nil; while(true) { ret = UI::UserInput(); - if (ret == `snapshots_table) { + 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) { + selected = (integer) UI::QueryWidget (`id (`coupled_snapshots_table), `CurrentItem); + ret = `show; + } + if(ret == `abort || ret == `cancel || ret == `back) { if(ReallyAbort()) break; else continue; } - else if (ret == `add || ret == `show) { - integer selected = (integer) UI::QueryWidget (`id (`snapshots_table), `CurrentItem); + else if (ret == `show) { Snapper::selected_snapshot = snapshots[selected]:$[]; break; } @@ -158,7 +196,10 @@ map open_items = $[]; list<map> file_list = Snapper::selected_snapshot["files"]:[]; - string snapshot_name = Snapper::selected_snapshot["name"]:""; + integer snapshot_num = Snapper::selected_snapshot["num"]:0; + // FIXME what to use for previous_num in non-post snapshots? + integer previous_num = Snapper::selected_snapshot["pre_num"]:snapshot_num; + string snapshot_name = tostring (snapshot_num); map<string,map> tree_map = $[]; // helper function: update the global map with directory tree structure @@ -217,10 +258,10 @@ } // helper function: show the specific modification between snapshots - void show_file_modification (string file, string pre, string post) { + void show_file_modification (string file, integer from, integer to) { term content = `VBox (); - map modification = Snapper::GetFileModification (file, pre, post); + map modification = Snapper::GetFileModification (file, from, to); if (haskey (modification, "diff")) { string diff = modification["diff"]:""; @@ -271,7 +312,7 @@ )))), `VSpacing () )); - show_file_modification (current, snapshot_name + "/pre", snapshot_name + "/post"); + show_file_modification (current, previous_num, snapshot_num); } else { @@ -284,7 +325,7 @@ `HWeight (1, `HBox (`VSpacing (20), `VBox (`HSpacing(70), `HBox ( `HSpacing (), - `ReplacePoint (`id (`reptree), `Tree (`id(`tree), `opt (`multiSelection), snapshot_name, [])), + `ReplacePoint (`id (`reptree), `Tree (`id(`tree), `opt (`notify, `multiSelection), snapshot_name, [])), `HSpacing () ), `HBox ( @@ -367,11 +408,11 @@ } else if (ret == `diff_snapshot) { - show_file_modification (current, snapshot_name + "/pre", snapshot_name + "/post"); + show_file_modification (current, previous_num, snapshot_num); } else if (ret == `diff_current) { - show_file_modification (current, snapshot_name + "/post", ""); + show_file_modification (current, snapshot_num, 0); } else if (ret == `abort || ret == `cancel || ret == `back) { break; -- 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] r63364 - in /branches/SuSE-Code-11-SP2-Branch/sound: package/yast2-sound.changes sound/src/mixer.ycp
by lslezak＠svn2.opensuse.org 07 Feb '11

07 Feb '11

Author: lslezak Date: Mon Feb 7 16:10:53 2011 New Revision: 63364 URL: http://svn.opensuse.org/viewcvs/yast?rev=63364&view=rev Log: - fixed mixer (volume setting) dialog - yast used the previous value for teh volume level so the value displayed in the UI and the actual volume setting were not in sync when moving the sliders (bnc#664094) Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes branches/SuSE-Code-11-SP2-Branch/sound/sound/src/mixer.ycp Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Mon Feb 7 16:10:53 2011 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Feb 7 14:20:51 UTC 2011 - lslezak(a)suse.cz + +- fixed mixer (volume setting) dialog - yast used the previous + value for teh volume level so the value displayed in the UI and + the actual volume setting were not in sync when moving the + sliders (bnc#664094) + +------------------------------------------------------------------- Thu Oct 14 12:32:32 UTC 2010 - lslezak(a)suse.cz - make the joystick dialog label better translatable in RTL Modified: branches/SuSE-Code-11-SP2-Branch/sound/sound/src/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/sound/src/mixer.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/sound/src/mixer.ycp Mon Feb 7 16:10:53 2011 @@ -307,7 +307,6 @@ con, help, Label::BackButton(), Label::OKButton() ); any ui = nil; // value can be `next `abort... or string (channel name) - integer value = 0; UI::ChangeWidget (`id(`test), `Enabled, !Mode::config()); @@ -328,8 +327,7 @@ // set volume if (Sound::use_alsa) { - setVolume ((string)ui, card_id, value); - value = (integer)UI::QueryWidget(`id(ui), `Value); + setVolume ((string)ui, card_id, (integer)UI::QueryWidget(`id(ui), `Value)); } else { -- 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] r63363 - /tags/stable-2_20_2/sound/
by lslezak＠svn2.opensuse.org 07 Feb '11

07 Feb '11

Author: lslezak Date: Mon Feb 7 15:48:12 2011 New Revision: 63363 URL: http://svn.opensuse.org/viewcvs/yast?rev=63363&view=rev Log: Created tag stable-2_20_2 for sound Added: tags/stable-2_20_2/sound/ (props changed) - copied from r63362, trunk/sound/ -- 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] r63362 - in /trunk/sound: VERSION package/yast2-sound.changes sound/src/mixer.ycp
by lslezak＠svn2.opensuse.org 07 Feb '11

07 Feb '11

Author: lslezak Date: Mon Feb 7 15:48:05 2011 New Revision: 63362 URL: http://svn.opensuse.org/viewcvs/yast?rev=63362&view=rev Log: - fixed mixer (volume setting) dialog - yast used the previous value for teh volume level so the value displayed in the UI and the actual volume setting were not in sync when moving the sliders (bnc#664094) - 2.20.2 Modified: trunk/sound/VERSION trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/mixer.ycp Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=63362&r1=63361… ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Mon Feb 7 15:48:05 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Mon Feb 7 15:48:05 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Feb 7 14:20:51 UTC 2011 - lslezak(a)suse.cz + +- fixed mixer (volume setting) dialog - yast used the previous + value for teh volume level so the value displayed in the UI and + the actual volume setting were not in sync when moving the + sliders (bnc#664094) +- 2.20.2 + +------------------------------------------------------------------- Wed Jan 5 13:15:44 UTC 2011 - lslezak(a)suse.cz - enable PulseAudio also in KDE installations (bnc#662260) Modified: trunk/sound/sound/src/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/mixer.ycp?rev=63… ============================================================================== --- trunk/sound/sound/src/mixer.ycp (original) +++ trunk/sound/sound/src/mixer.ycp Mon Feb 7 15:48:05 2011 @@ -309,7 +309,6 @@ con, help, Label::BackButton(), Label::OKButton() ); any ui = nil; // value can be `next `abort... or string (channel name) - integer value = 0; UI::ChangeWidget (`id(`test), `Enabled, !Mode::config()); @@ -330,8 +329,7 @@ // set volume if (Sound::use_alsa) { - setVolume ((string)ui, card_id, value); - value = (integer)UI::QueryWidget(`id(ui), `Value); + setVolume ((string)ui, card_id, (integer)UI::QueryWidget(`id(ui), `Value)); } else { -- 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] r63361 - in /branches/tmp/jsuchome/snapper: agent-snapper/src/SnapperAgent.cc src/dialogs.ycp
by aschnell＠svn2.opensuse.org 07 Feb '11

07 Feb '11

Author: aschnell Date: Mon Feb 7 14:45:52 2011 New Revision: 63361 URL: http://svn.opensuse.org/viewcvs/yast?rev=63361&view=rev Log: - adapted to date change from string to time_t Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc branches/tmp/jsuchome/snapper/src/dialogs.ycp Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agent-sn… ============================================================================== --- branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc Mon Feb 7 14:45:52 2011 @@ -132,7 +132,7 @@ } s->add (YCPString ("num"), YCPInteger (it->getNum())); - s->add (YCPString ("date"), YCPString (it->getDate())); + s->add (YCPString ("date"), YCPInteger (it->getDate())); if (it->getType() == SINGLE || it->getType() == PRE) s->add (YCPString ("description"), YCPString (it->getDescription())); 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 Mon Feb 7 14:45:52 2011 @@ -80,7 +80,12 @@ integer i = -1; list snapshot_items = maplist (map s, snapshots, ``{ i = i + 1; - return `item (`id (i), s["date"]:"", s["name"]:"", s["description"]:""); + + string date = ""; + if (s["num"]:0 != 0) + date = timestring("%c", s["date"]:0, false); + + return `item (`id (i), date, s["name"]:"", s["description"]:""); }); term contents = `VBox ( -- 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] r63360 - /branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc
by jsuchome＠svn2.opensuse.org 07 Feb '11

07 Feb '11

Author: jsuchome Date: Mon Feb 7 14:39:42 2011 New Revision: 63360 URL: http://svn.opensuse.org/viewcvs/yast?rev=63360&view=rev Log: return different files as a result of diff call temp. add here statusToString function Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agent-sn… ============================================================================== --- branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc Mon Feb 7 14:39:42 2011 @@ -45,6 +45,28 @@ return deflt; } +string statusToString(unsigned int status) +{ + string ret; + + if (status & CREATED) + ret += "+"; + else if (status & DELETED) + ret += "-"; + else if (status & TYPE) + ret += "t"; + else if (status & CONTENT) + ret += "c"; + else + ret += "."; + + ret += status & PERMISSIONS ? "p" : "."; + ret += status & USER ? "u" : "."; + ret += status & GROUP ? "g" : "."; + + return ret; +} + /** * Constructor */ @@ -128,7 +150,7 @@ * Read(.snapper.diff) -> show difference between snapnots num1 and num2. */ if (PC(0) == "diff") { - YCPMap retmap; + YCPList retlist; unsigned int num1 = getIntValue (argmap, "from", 0); unsigned int num2 = getIntValue (argmap, "to", 0); @@ -138,12 +160,14 @@ const Files& files = sh->getFiles(); for (Files::const_iterator it = files.begin(); it != files.end(); ++it) { -// cout << statusToString(it->getPreToPostStatus()) << " " << it->getName() << endl; + YCPMap filemap; y2internal ("file :%s ", it->getName().c_str ()); - y2internal ("status: %d", it->getPreToPostStatus()); + y2internal ("pre to post status: %d", it->getPreToPostStatus()); + filemap->add (YCPString ("name"), YCPString (it->getName())); + filemap->add (YCPString ("changes"), YCPString (statusToString (it->getPreToPostStatus()))); + retlist->add (filemap); } - - return retmap; + return retlist; } else { y2error("Wrong path '%s' in Read().", path->toString().c_str()); -- 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] r63359 - in /trunk/ruby-bindings: examples/ruby/ui.rb src/ruby/CMakeLists.txt src/ruby/Y2RubyTypeConv.cc src/ruby/ycp.rb
by mvidner＠svn2.opensuse.org 06 Feb '11

06 Feb '11

Author: mvidner Date: Sun Feb 6 14:36:08 2011 New Revision: 63359 URL: http://svn.opensuse.org/viewcvs/yast?rev=63359&view=rev Log: Made UI work again. - Crude fix of the example But the intended usage is still unclear to me - ycpx.so needs to link the UI plugin otherwise YUIComponent::uiComponent will not be found at run time (unless called from y2base) - Fixed YaST::Term construction Use the C implementation Renamed the Ruby class to YaST::TermBuilder. Modified: trunk/ruby-bindings/examples/ruby/ui.rb trunk/ruby-bindings/src/ruby/CMakeLists.txt trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc trunk/ruby-bindings/src/ruby/ycp.rb Modified: trunk/ruby-bindings/examples/ruby/ui.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/ui.r… ============================================================================== --- trunk/ruby-bindings/examples/ruby/ui.rb (original) +++ trunk/ruby-bindings/examples/ruby/ui.rb Sun Feb 6 14:36:08 2011 @@ -1,23 +1,16 @@ require 'ycp' -require 'ycp/ui' - YCP::Ui::init("qt") -include YaST::Ui +include YCP::Ui t = HBox( Label("Welcome to Ruby!"), PushButton("Push me") ) - -puts "#{t.to_s} #{t.class}" - -ui.OpenDialog(t) -ui.UserInput() - # You can also use downcase, as the symbols are aliased -t = hbox( label("Welcome to Ruby!"), pushbutton("Push me") ) +#t = hbox( label("Welcome to Ruby!"), pushbutton("Push me") ) puts "#{t.to_s} #{t.class}" -ui.OpenDialog(t) -ui.UserInput() - +# how should this work? +# ui.OpenDialog(t) +# ui.UserInput() -exit +p YCP::call_ycp_function( "UI", "OpenDialog", t ) +p YCP::call_ycp_function( "UI", "UserInput" ) Modified: trunk/ruby-bindings/src/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/CMakeList… ============================================================================== --- trunk/ruby-bindings/src/ruby/CMakeLists.txt (original) +++ trunk/ruby-bindings/src/ruby/CMakeLists.txt Sun Feb 6 14:36:08 2011 @@ -76,6 +76,7 @@ # TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_WFM_LIBRARY} ) TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_SCR_LIBRARY} ) +TARGET_LINK_LIBRARIES( ycpx ${YAST_PLUGIN_UI_LIBRARY} ) TARGET_LINK_LIBRARIES( ycpx ${RUBY_LIBRARY} ) Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Sun Feb 6 14:36:08 2011 @@ -225,11 +225,11 @@ VALUE cname = rb_funcall(rb_funcall(value, rb_intern("class"), 0), rb_intern("to_s"), 0); const char *class_name = StringValuePtr(cname); /* get the Term class object */ - if ( !strcmp(class_name, "Yast::Term") ) + if ( !strcmp(class_name, "YaST::Term") ) { return ryast_yterm_from_rterm(value); } - rb_raise( rb_eTypeError, "Conversion of Ruby type not supported"); + rb_raise( rb_eTypeError, "Conversion of Ruby type %s not supported", class_name); return YCPValue(); } } Modified: trunk/ruby-bindings/src/ruby/ycp.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/ycp.rb?re… ============================================================================== --- trunk/ruby-bindings/src/ruby/ycp.rb (original) +++ trunk/ruby-bindings/src/ruby/ycp.rb Sun Feb 6 14:36:08 2011 @@ -163,7 +163,7 @@ # module YaST - class Term + class TermBuilder # blank slate instance_methods.each { |m| undef_method m unless (m =~ /^__|instance_eval$/)} -- 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] r63358 - in /trunk/ruby-bindings/examples/ruby: module-storage.rb module-timezone.rb
by mvidner＠svn2.opensuse.org 06 Feb '11

06 Feb '11

Author: mvidner Date: Sun Feb 6 14:25:15 2011 New Revision: 63358 URL: http://svn.opensuse.org/viewcvs/yast?rev=63358&view=rev Log: Fixed examples by requiring ycp instead of yast the require was renamed some time ago Modified: trunk/ruby-bindings/examples/ruby/module-storage.rb trunk/ruby-bindings/examples/ruby/module-timezone.rb Modified: trunk/ruby-bindings/examples/ruby/module-storage.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/modu… ============================================================================== --- trunk/ruby-bindings/examples/ruby/module-storage.rb (original) +++ trunk/ruby-bindings/examples/ruby/module-storage.rb Sun Feb 6 14:25:15 2011 @@ -1,4 +1,4 @@ -require 'yast' +require 'ycp' require 'ycp/storage' Modified: trunk/ruby-bindings/examples/ruby/module-timezone.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/examples/ruby/modu… ============================================================================== --- trunk/ruby-bindings/examples/ruby/module-timezone.rb (original) +++ trunk/ruby-bindings/examples/ruby/module-timezone.rb Sun Feb 6 14:25:15 2011 @@ -1,4 +1,4 @@ -require 'yast' +require 'ycp' require 'ycp/timezone' zonemap = YCP::Timezone::get_zonemap -- 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] r63357 - /trunk/ruby-bindings/src/ruby/YCP.cc
by mvidner＠svn2.opensuse.org 06 Feb '11

06 Feb '11

Author: mvidner Date: Sun Feb 6 14:12:21 2011 New Revision: 63357 URL: http://svn.opensuse.org/viewcvs/yast?rev=63357&view=rev Log: Make rdoc find the methods. It needs to see the standard RUBY_METHOD_FUNC macro. Modified: trunk/ruby-bindings/src/ruby/YCP.cc Modified: trunk/ruby-bindings/src/ruby/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YCP.cc?re… ============================================================================== --- trunk/ruby-bindings/src/ruby/YCP.cc (original) +++ trunk/ruby-bindings/src/ruby/YCP.cc Sun Feb 6 14:12:21 2011 @@ -54,11 +54,6 @@ // more useful macros #define RB_FINALIZER(func) ((void (*)(...))func) -// this macro saves us from typing -// (ruby_method*) & method_name -// in rb_define_method -#define RB_METHOD(func) ((VALUE (*)(...))func) - #define GetY2Object(obj, po) \ Data_Get_Struct(obj, Y2Namespace, po) @@ -94,7 +89,7 @@ /*-------------------------------------------- * - * Document-module: Ui + * Document-module: YCP::Ui * *-------------------------------------------- */ @@ -666,26 +661,26 @@ * module YCP */ rb_mYCP = rb_define_module("YCP"); - rb_define_singleton_method( rb_mYCP, "import", RB_METHOD(ycp_module_import), 1); - rb_define_singleton_method( rb_mYCP, "call_ycp_function", RB_METHOD(ycp_module_call_ycp_function), -1); - rb_define_singleton_method( rb_mYCP, "call_ycp_builtin", RB_METHOD(ycp_module_call_ycp_builtin), -1); - rb_define_singleton_method( rb_mYCP, "method_missing", RB_METHOD(ycp_method_missing), -1); - - rb_define_singleton_method( rb_mYCP, "each_symbol", RB_METHOD(ycp_module_each_symbol), 1); - rb_define_singleton_method( rb_mYCP, "each_builtin_symbol", RB_METHOD(ycp_module_each_builtin_symbol), 1); - rb_define_singleton_method( rb_mYCP, "each_builtin", RB_METHOD(ycp_module_each_builtin), 0); + rb_define_singleton_method( rb_mYCP, "import", RUBY_METHOD_FUNC(ycp_module_import), 1); + rb_define_singleton_method( rb_mYCP, "call_ycp_function", RUBY_METHOD_FUNC(ycp_module_call_ycp_function), -1); + rb_define_singleton_method( rb_mYCP, "call_ycp_builtin", RUBY_METHOD_FUNC(ycp_module_call_ycp_builtin), -1); + rb_define_singleton_method( rb_mYCP, "method_missing", RUBY_METHOD_FUNC(ycp_method_missing), -1); + + rb_define_singleton_method( rb_mYCP, "each_symbol", RUBY_METHOD_FUNC(ycp_module_each_symbol), 1); + rb_define_singleton_method( rb_mYCP, "each_builtin_symbol", RUBY_METHOD_FUNC(ycp_module_each_builtin_symbol), 1); + rb_define_singleton_method( rb_mYCP, "each_builtin", RUBY_METHOD_FUNC(ycp_module_each_builtin), 0); /* * module YCP::Ui */ rb_mUi = rb_define_module_under(rb_mYCP, "Ui"); - rb_define_singleton_method( rb_mUi, "init", RB_METHOD(ui_init), -1); + rb_define_singleton_method( rb_mUi, "init", RUBY_METHOD_FUNC(ui_init), -1); /* * module YaST */ rb_mYaST = rb_define_module("YaST"); - rb_define_method( rb_mYaST, "logger", RB_METHOD(yast_y2_logger), -1); + rb_define_method( rb_mYaST, "logger", RUBY_METHOD_FUNC(yast_y2_logger), -1); y2internal("ryast_path_init\n"); ryast_path_init(rb_mYaST); -- 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] r63356 - /trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes
by coolo＠svn2.opensuse.org 06 Feb '11

06 Feb '11

Author: coolo Date: Sun Feb 6 11:01:15 2011 New Revision: 63356 URL: http://svn.opensuse.org/viewcvs/yast?rev=63356&view=rev Log: changelog 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 Sun Feb 6 11:01:15 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Feb 6 10:00:59 UTC 2011 - coolo(a)novell.com + +- fix syntax error + +------------------------------------------------------------------- Fri Feb 4 14:58:29 CET 2011 - tgoettlicher(a)suse.de - Fixed selection of check boxes in tree widgets (bnc #669138) -- 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] r63355 - /trunk/ycp-ui-bindings/src/YCPDialogParser.cc
by coolo＠svn2.opensuse.org 06 Feb '11

06 Feb '11

Author: coolo Date: Sun Feb 6 11:00:52 2011 New Revision: 63355 URL: http://svn.opensuse.org/viewcvs/yast?rev=63355&view=rev Log: fix syntax error Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogPar… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Sun Feb 6 11:00:52 2011 @@ -2199,7 +2199,7 @@ YCPList itemList = term->value( argnr+1 )->asList(); tree->addItems( YCPTreeItemParser::parseTreeItemList( itemList ) ); - if ( tree->hasItems() ) && !multiSelection ) + if ( tree->hasItems() && !multiSelection ) tree->selectItem( tree->firstItem() ); } -- 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] r63354 - /branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: aschnell Date: Fri Feb 4 18:57:57 2011 New Revision: 63354 URL: http://svn.opensuse.org/viewcvs/yast?rev=63354&view=rev Log: - fixed bnc number Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes Fri Feb 4 18:57:57 2011 @@ -9,7 +9,7 @@ - allow floating point value in reserved block percentage and set default to reserve about 1Gig, but <= 5.0% and >= 0.1% - (bnc #661953) + (bnc #661179) ------------------------------------------------------------------- Thu Oct 21 14:14:10 CEST 2010 - aschnell(a)suse.de -- 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] r63353 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: aschnell Date: Fri Feb 4 18:57:50 2011 New Revision: 63353 URL: http://svn.opensuse.org/viewcvs/yast?rev=63353&view=rev Log: - fixed bnc number Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Feb 4 18:57:50 2011 @@ -13,7 +13,7 @@ - allow floating point value in reserved block percentage and set default to reserve about 1Gig, but <= 5.0% and >= 0.1% - (bnc #661953) + (bnc #661179) ------------------------------------------------------------------- Thu Dec 23 17:40:50 CET 2010 - fehr(a)suse.de -- 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] r63352 - /tags/stable-2_20_14/ldap-client/
by jsuchome＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: jsuchome Date: Fri Feb 4 15:20:05 2011 New Revision: 63352 URL: http://svn.opensuse.org/viewcvs/yast?rev=63352&view=rev Log: Created tag stable-2_20_14 for ldap-client Added: tags/stable-2_20_14/ldap-client/ - copied from r63351, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63351 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/ui.ycp yast2-ldap-client.spec.in
by jsuchome＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: jsuchome Date: Fri Feb 4 15:19:57 2011 New Revision: 63351 URL: http://svn.opensuse.org/viewcvs/yast?rev=63351&view=rev Log: - reset connection when TLS status has been changed (bnc#662949) - 2.20.14 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/yast2-ldap-client.spec.in Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=63351&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Fri Feb 4 15:19:57 2011 @@ -1 +1 @@ -2.20.13 +2.20.14 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Fri Feb 4 15:19:57 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 4 08:57:50 CET 2011 - jsuchome(a)suse.cz + +- reset connection when TLS status has been changed (bnc#662949) +- 2.20.14 + +------------------------------------------------------------------- Tue Feb 1 11:32:25 CET 2011 - jsuchome(a)suse.cz - do not add +-lines when configuring sssd (bnc#668565) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=633… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Fri Feb 4 15:19:57 2011 @@ -272,6 +272,9 @@ global boolean ldap_initialized = false; + // was LDAP connection initialized with TLS? + global boolean tls_when_initialized = false; + /** * If false, do not read settings already set from outside * used e.g. for Users YaPI. see bug #60898 @@ -1097,6 +1100,14 @@ } /** + * Shut down existing LDAP connection + */ + global define boolean LDAPClose () { + ldap_initialized = false; + return (boolean) SCR::Execute (.ldap.close); + } + + /** * Initializes LDAP agent */ global define string LDAPInit () ``{ @@ -1120,6 +1131,7 @@ else { ldap_initialized = init; + tls_when_initialized= ldap_tls; if (!init) { ret = LDAPError(); @@ -1134,6 +1146,10 @@ */ global define boolean ConnectWithoutTLS (map errmap) { + string details = errmap["msg"]:""; + if (errmap["server_msg"]:"" != "") + details = sformat ("%1\n%2", details, errmap["server_msg"]:""); + UI::OpenDialog (`HBox(`HSpacing (0.5), `VBox( `VSpacing (0.5), @@ -1168,8 +1184,10 @@ if (ret == `details) { if ((boolean)UI::QueryWidget (`id(`details), `Value)) - UI::ReplaceWidget (`id(`rp), `VBox ( - `Label (errmap["msg"]:""))); + { + + UI::ReplaceWidget (`id(`rp), `VBox (`Label (details))); + } else UI::ReplaceWidget (`id(`rp), `Empty()); } @@ -1230,6 +1248,7 @@ } } ldap_initialized = init; + tls_when_initialized= args["use_tls"]:"no" == "yes"; } return ret; } Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=63351… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Fri Feb 4 15:19:57 2011 @@ -368,6 +368,10 @@ if (result == `fetch) { Ldap::tls_switched_off = false; + if (Ldap::ldap_initialized && Ldap::tls_when_initialized != ldap_tls) + { + Ldap::LDAPClose (); + } string dn = Ldap::ldap_initialized ? LdapPopup::BrowseTree ("") : LdapPopup::InitAndBrowseTree ("", $[ @@ -764,15 +768,12 @@ if (base_dn == "") return; - if (Ldap::ldap_initialized || true == SCR::Execute (.ldap, $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "port" : Ldap::GetFirstPort (Ldap::server), - "version" : Ldap::ldap_v2 ? 2 : 3, - "use_tls" : Ldap::ldap_tls ? "yes" : "no", - "cacertdir" : Ldap::tls_cacertdir, - "cacertfile": Ldap::tls_cacertfile - ]) - ) + if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) + { + Ldap::LDAPClose (); + } + + if (Ldap::ldap_initialized || Ldap::LDAPInit () == "") { ppolicies_enabled = (boolean) SCR::Execute (.ldap.ppolicy, $[ "hostname" : Ldap::GetFirstServer (Ldap::server), @@ -1092,6 +1093,10 @@ if (is (result, symbol) && contains ([`br, `br_passwd, `br_shadow, `br_group ], (symbol)result)) { + if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) + { + Ldap::LDAPClose (); + } string dn = Ldap::ldap_initialized ? LdapPopup::BrowseTree (base_dn) : LdapPopup::InitAndBrowseTree (base_dn, $[ Modified: trunk/ldap-client/yast2-ldap-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/yast2-ldap-client.sp… ============================================================================== --- trunk/ldap-client/yast2-ldap-client.spec.in (original) +++ trunk/ldap-client/yast2-ldap-client.spec.in Fri Feb 4 15:19:57 2011 @@ -13,8 +13,8 @@ Requires: yast2-network -# removed lowercasing of LDAP object names -Requires: yast2-ldap >= 2.17.1 +# .close +Requires: yast2-ldap >= 2.20.1 # etc_sssd_conf.scr Requires: yast2-pam >= 2.20.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] r63350 - /tags/stable-2_20_1/ldap/
by jsuchome＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: jsuchome Date: Fri Feb 4 15:19:08 2011 New Revision: 63350 URL: http://svn.opensuse.org/viewcvs/yast?rev=63350&view=rev Log: Created tag stable-2_20_1 for ldap Added: tags/stable-2_20_1/ldap/ - copied from r63349, trunk/ldap/ -- 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] r63349 - in /trunk/ldap: VERSION doc/ldap.html package/yast2-ldap.changes src/LdapAgent.cc
by jsuchome＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: jsuchome Date: Fri Feb 4 15:18:59 2011 New Revision: 63349 URL: http://svn.opensuse.org/viewcvs/yast?rev=63349&view=rev Log: - added command to close the connection - 2.20.1 Modified: trunk/ldap/VERSION trunk/ldap/doc/ldap.html trunk/ldap/package/yast2-ldap.changes trunk/ldap/src/LdapAgent.cc Modified: trunk/ldap/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/VERSION?rev=63349&r1=63348&… ============================================================================== --- trunk/ldap/VERSION (original) +++ trunk/ldap/VERSION Fri Feb 4 15:18:59 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/ldap/doc/ldap.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/doc/ldap.html?rev=63349&r1=… ============================================================================== --- trunk/ldap/doc/ldap.html (original) +++ trunk/ldap/doc/ldap.html Fri Feb 4 15:18:59 2011 @@ -450,6 +450,15 @@ </td> </tr> + <tr><td><tt>.ldap.close</td> + <td align="left">none</td> + <td>Closes current connection: does UNBIND and destroys current object. + <pre> + Execute (.ldap.close) + </pre> + + </td> + </tr> </table> Modified: trunk/ldap/package/yast2-ldap.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/package/yast2-ldap.changes?… ============================================================================== --- trunk/ldap/package/yast2-ldap.changes (original) +++ trunk/ldap/package/yast2-ldap.changes Fri Feb 4 15:18:59 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 4 13:57:47 CET 2011 - jsuchome(a)suse.cz + +- added command to close the connection +- 2.20.1 + +------------------------------------------------------------------- Thu Jan 13 09:33:46 CET 2011 - jsuchome(a)suse.cz - added support for setting TLS options Modified: trunk/ldap/src/LdapAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/LdapAgent.cc?rev=63349&… ============================================================================== --- trunk/ldap/src/LdapAgent.cc (original) +++ trunk/ldap/src/LdapAgent.cc Fri Feb 4 15:18:59 2011 @@ -1257,7 +1257,6 @@ } port = getIntValue (argmap, "port", DEFAULT_PORT); - // int version = getIntValue (argmap, "version", 3); TODO // TODO how/where to set this? cons = new LDAPConstraints; @@ -1430,6 +1429,16 @@ ldap->unbind(); return YCPBoolean(true); } + /** + * close the connection, delete object + */ + else if (PC(0) == "close") { + ldap->unbind(); + delete ldap; + ldap = NULL; + ldap_initialized = false; + return YCPBoolean(true); + } /** * Initialize schema: read and parse it */ -- 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] r63348 - in /trunk/ycp-ui-bindings: VERSION package/yast2-ycp-ui-bindings.changes src/YCPDialogParser.cc
by tgoettlicher＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: tgoettlicher Date: Fri Feb 4 14:58:33 2011 New Revision: 63348 URL: http://svn.opensuse.org/viewcvs/yast?rev=63348&view=rev Log: - Fixed selection of check boxes in tree widgets (bnc #669138) - V 2.20.1 Modified: trunk/ycp-ui-bindings/VERSION trunk/ycp-ui-bindings/package/yast2-ycp-ui-bindings.changes trunk/ycp-ui-bindings/src/YCPDialogParser.cc Modified: trunk/ycp-ui-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/VERSION?rev=6334… ============================================================================== --- trunk/ycp-ui-bindings/VERSION (original) +++ trunk/ycp-ui-bindings/VERSION Fri Feb 4 14:58:33 2011 @@ -1 +1 @@ -2.20.0 +2.20.1 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 4 14:58:33 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 4 14:58:29 CET 2011 - tgoettlicher(a)suse.de + +- Fixed selection of check boxes in tree widgets (bnc #669138) +- V 2.20.1 + +------------------------------------------------------------------- Thu Feb 3 15:09:13 CET 2011 - tgoettlicher(a)suse.de - V 2.20.0 Modified: trunk/ycp-ui-bindings/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/src/YCPDialogPar… ============================================================================== --- trunk/ycp-ui-bindings/src/YCPDialogParser.cc (original) +++ trunk/ycp-ui-bindings/src/YCPDialogParser.cc Fri Feb 4 14:58:33 2011 @@ -2199,7 +2199,7 @@ YCPList itemList = term->value( argnr+1 )->asList(); tree->addItems( YCPTreeItemParser::parseTreeItemList( itemList ) ); - if ( tree->hasItems() ) + if ( tree->hasItems() ) && !multiSelection ) tree->selectItem( tree->firstItem() ); } -- 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] r63347 - in /trunk/printer: VERSION package/yast2-printer.changes src/autoconfig.ycp src/dialogs.ycp src/helps.ycp src/printer_auto.ycp src/printer_proposal.ycp src/sharing.ycp
by jsmeix＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: jsmeix Date: Fri Feb 4 14:57:22 2011 New Revision: 63347 URL: http://svn.opensuse.org/viewcvs/yast?rev=63347&view=rev Log: - Fixed the automatic configuration in printer_proposal.ycp so that it waits until config files have been actually updated. - Enhanced the "Automatic Configuration" dialog so that the user can trigger that the automatic configuration via printer_proposal.ycp is run. - 2.20.7 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/autoconfig.ycp trunk/printer/src/dialogs.ycp trunk/printer/src/helps.ycp trunk/printer/src/printer_auto.ycp trunk/printer/src/printer_proposal.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=63347&r1=633… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Feb 4 14:57:22 2011 @@ -1 +1 @@ -2.20.6 +2.20.7 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Feb 4 14:57:22 2011 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Feb 4 14:51:44 CET 2011 - jsmeix(a)suse.de + +- Fixed the automatic configuration in printer_proposal.ycp + so that it waits until config files have been actually updated. +- Enhanced the "Automatic Configuration" dialog so that + the user can trigger that the automatic configuration + via printer_proposal.ycp is run. +- 2.20.7 + +------------------------------------------------------------------- Tue Jan 25 14:10:21 CET 2011 - jsmeix(a)suse.de - Adapted the "Driver Packages" dialog because the package Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=6… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Fri Feb 4 14:57:22 2011 @@ -21,7 +21,7 @@ /** * File: include/printer/dialogs.ycp * Package: Configuration of printer - * Summary: Autoconfig settings dialog definition + * Summary: Automatic Configuration dialog definition * Authors: Johannes Meixner <jsmeix(a)suse.de> * * $Id: autoconfig.ycp 27914 2006-02-13 14:32:08Z locilka $ @@ -41,11 +41,25 @@ ( // Have space between the top of the dialog and the content: `VStretch(), `Left + ( `CheckBox + ( // CheckBox to let YaST configure local connected printers automatically: + `id("printer_proposal_check_box"), + `opt(`notify), + // CheckBox to trigger an automatic configuration of local connected printers + // by calling the YaST printer module autoconfig functionality right now. + _("&Do an automatic configuration of local connected printers now"), + // This trigger CheckBox is initially off in any case: + false + ) + ), + // Have space between the two parts of of the dialog: + `VStretch(), + `Left ( `Label ( `id("autoconfig_label"), // Header for a dialog section where the user can // specify if USB printers are configured automatically: - _("Specify if USB printers are configured automatically") + _("Specify if automatic USB printer configuration should happen when plug in") ) ), `Left @@ -58,7 +72,7 @@ // CheckBox for automatic configuration of USB printers // by installing or removing the RPM package udev-configure-printer. // Do not change or translate "udev-configure-printer", it is a RPM package name. - _("&Use the package udev-configure-printer for automated USB printer configuration") + _("&Use the package udev-configure-printer for automatic USB printer configuration") ) ), // Have space between the content and the bottom of the dialog: @@ -67,8 +81,8 @@ void initAutoconfig( string key ) { y2milestone( "entering initAutoconfig with key '%1'", key ); - boolean autoconfig_settings_dialog_is_useless = false; - // The whole Autoconfig Settings dialog is useless if it is a "client-only" config. + boolean autoconfig_dialog_is_useless = false; + // The whole Automatic Configuration dialog is useless if it is a "client-only" config. // Determine whether or not it is currently a real client-only config // (i.e. a ServerName != "localhost/127.0.0.1" in /etc/cups/client.conf) // and ignore when it fails (i.e. use the fallback value silently): @@ -83,8 +97,8 @@ _("A remote CUPS server setting conflicts with automatic configuration of printers for the local system.") ) ) - { autoconfig_settings_dialog_is_useless = true; - y2milestone( "autoconfig_settings_dialog_is_useless because user decided not to disable client-only CUPS server '%1'", + { autoconfig_dialog_is_useless = true; + y2milestone( "autoconfig_dialog_is_useless because user decided not to disable client-only CUPS server '%1'", Printerlib::client_conf_server_name ); } @@ -95,8 +109,8 @@ _("Failed to remove the 'ServerName' entry in /etc/cups/client.conf"), Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" ); - autoconfig_settings_dialog_is_useless = true; - y2milestone( "autoconfig_settings_dialog_is_useless because it failed to disable client-only CUPS server '%1'", + autoconfig_dialog_is_useless = true; + y2milestone( "autoconfig_dialog_is_useless because it failed to disable client-only CUPS server '%1'", Printerlib::client_conf_server_name ); } @@ -104,15 +118,18 @@ } // When it is no "client-only" config, // determine whether or not a local cupsd is accessible: - if( ! autoconfig_settings_dialog_is_useless ) + if( ! autoconfig_dialog_is_useless ) { if( ! Printerlib::GetAndSetCupsdStatus( "" ) ) { // Printerlib::GetAndSetCupsdStatus already shows a confirmation popup: if( ! Printerlib::GetAndSetCupsdStatus( "start" ) ) - { autoconfig_settings_dialog_is_useless = true; - y2milestone( "autoconfig_settings_dialog_is_useless because 'rccups start' failed." ); + { autoconfig_dialog_is_useless = true; + y2milestone( "autoconfig_dialog_is_useless because 'rccups start' failed." ); } } } + // The CheckBox to trigger an automatic configuration of local connected printers + // is initially off in any case: + UI::ChangeWidget( `id("printer_proposal_check_box"), `Value, false ); // Determine if udev-configure-printer is installed. boolean udev_configure_printer_installed = Printerlib::TestAndInstallPackage( "udev-configure-printer", "installed" ); // Avoid a flickering change of the udev_configure_printer_check_box value @@ -124,9 +141,10 @@ else { UI::ChangeWidget( `id("udev_configure_printer_check_box"), `Value, false ); } - // Disable all widgets in the whole dialog if autoconfig_settings_dialog_is_useless: - if( autoconfig_settings_dialog_is_useless ) - { UI::ChangeWidget( `id("autoconfig_label"), `Enabled, false ); + // Disable all widgets in the whole dialog if autoconfig_dialog_is_useless: + if( autoconfig_dialog_is_useless ) + { UI::ChangeWidget( `id("printer_proposal_check_box"), `Enabled, false ); + UI::ChangeWidget( `id("autoconfig_label"), `Enabled, false ); UI::ChangeWidget( `id("udev_configure_printer_check_box"), `Enabled, false ); } y2milestone( "leaving initAutoconfig with udev_configure_printer_installed = '%1'", udev_configure_printer_installed ); @@ -176,7 +194,33 @@ symbol handleAutoconfig( string key, map event ) { y2milestone( "entering handleAutoconfig with key '%1'\nand event '%2'", key, event ); if( "ValueChanged" == event["EventReason"]:"" ) - { if( "udev_configure_printer_check_box" == event["WidgetID"]:"" ) + { if( "printer_proposal_check_box" == event["WidgetID"]:"" ) + { string queues_and_descriptions = ""; + // Call the YaST printer module autoconfig functionality: + map printer_proposal_result = (map)WFM::CallFunction( "printer_proposal", ["MakeProposal"] ); + y2milestone( "handleAutoconfig printer_proposal_result = '%1'", printer_proposal_result ); + if( printer_proposal_result != nil ) + { list<string> queues_and_descriptions_list = printer_proposal_result["raw_proposal"]:[""]; + foreach( string queue_and_description, + queues_and_descriptions_list, + { if( "" != queue_and_description ) + { queues_and_descriptions = queues_and_descriptions + "\n" + queue_and_description; + } + } + ); + } + if( "" == queues_and_descriptions ) + { queues_and_descriptions = _("The automated printer configuration was in vain."); + } + Popup::AnyMessage( // Popup::AnyMessage header: + _("Automated printer configuration results"), + // Popup::AnyMessage message: + queues_and_descriptions + ); + // Re-set the CheckBox to trigger automatic configuration back to its initial state 'off': + UI::ChangeWidget( `id("printer_proposal_check_box"), `Value, false ); + } + if( "udev_configure_printer_check_box" == event["WidgetID"]:"" ) { // Ignore its return code because it shows already Popup::Error messages: ApplyAutoconfigSettings(); } Modified: trunk/printer/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/dialogs.ycp?rev=6334… ============================================================================== --- trunk/printer/src/dialogs.ycp (original) +++ trunk/printer/src/dialogs.ycp Fri Feb 4 14:57:22 2011 @@ -109,9 +109,9 @@ "widget_names" : ["POLICIES"] ], "autoconfig" : - $[ "header" : _("Autoconfig Settings"), - "tree_item_label" : _("Autoconfig Settings"), - "caption" : _("Autoconfig Settings"), + $[ "header" : _("Automatic Configuration"), + "tree_item_label" : _("Automatic Configuration"), + "caption" : _("Automatic Configuration"), "contents" : `VBox( "AUTOCONFIG" ), "widget_names" : ["AUTOCONFIG"] ] Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=63347&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Fri Feb 4 14:57:22 2011 @@ -772,7 +772,7 @@ "), "sharing_dialog" : -// SharingDialog help 1/3: +// SharingDialog help 1/4: _(" <big>Sharing Print Queues and Publish Them Via Network</big> Usually CUPS (Common Unix Printing System) should be set up to use @@ -782,16 +782,35 @@ which is listening for incomming information about published printers. CUPS Browsing information is recieved via UDP port 631. ") + -// SharingDialog help 2/3: +// SharingDialog help 2/4: _(" First of all CUPS client systems must be allowed to access the CUPS server. -Then specify whether or not printers should be published to the clients. -It is not required to publish printers in any case. +Then specify whether or not printers should be published to the clients. +In a local network the usual way to set up CUPS Browsing is +to allow remote access for all hosts in the local network +and to publish printers to all those hosts. +It is not required to publish printers in any case. If you have only one single CUPS server, there is no need to use CUPS Browsing. Instead it is simpler to specify the CUPS server on the client systems (via 'Printing Via Network') so that the clients access the server directly. ") + -// SharingDialog help 3/3: +// SharingDialog help 3/4: +_(" +There are various ways which can coexist how to specify +which remote hosts are allowed to access the CUPS server. +Allow remote access for computers within the local network +will allow access from all hosts in the local network. +A remote host is in the local network when it has an IP address +that belongs to the same network as the CUPS server +and when the network connection of the host +uses a non-PPP interface on the CUPS server +(an interface whose IFF_POINTOPOINT flag is not set). +Alternatively or additionally an explicite list of network interfaces +from which remote access is allowed can be specified. +Alternatively or additionally an explicite list of +allowed IP addresses and/or networks can be specified. +") + +// SharingDialog help 4/4: _(" Regarding firewall: A firewall is used to protect running server processes @@ -859,18 +878,30 @@ "autoconfig" : // Autoconfig help 1/2: _(" -<big>CUPS Autoconfiguration for USB Printers</big> -USB Printer autoconfiguration is provided -by the RPM package 'udev-configure-printer'. -When its check box is initially not checked, it is not installed -and then you can select it so that it will be installed. -When its check box is initially checked, it is already installed -and then you can un-select it so that it will be removed. +<big>Automatic Configuration for Local Connected Printers</big> +Check the check box to run YaST's automatic configuration +for printers which are connected to the local host. +For each autodetected local connected printer, +YaST tests if there exists already a configuration. +If there is not yet a configuration, +YaST tries to find a matching driver for the printer +and if one is found, the printer is configured. +The resulting configuration is basically the same +as if one would have selected an autodetected printer +in the 'Add New Printer Configuration' dialog +and accepted whatever preselected values there. ") + // Autoconfig help 2/2: _(" +<big>Automatic Configuration for USB Printers</big> +The RPM package 'udev-configure-printer' provides +automatic configuration when USB printers are plugged in. +When its check box is initially not checked, it is not installed +and then you can select it so that it will be installed. +When its check box is initially checked, it is already installed +and then you can un-select it so that it will be removed. When udev-configure-printer is installed, -automatic USB printer setup happens via the entries +automatic USB printer configuration happens via the entries in its udev config file /lib/udev/rules.d/70-printers.rules which triggers to run 'udev-configure-printer add' when a USB printer is plugged in Modified: trunk/printer/src/printer_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_auto.ycp?rev… ============================================================================== --- trunk/printer/src/printer_auto.ycp (original) +++ trunk/printer/src/printer_auto.ycp Fri Feb 4 14:57:22 2011 @@ -71,11 +71,16 @@ string func = ""; map param = $[]; -/* Check arguments */ -if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { - func = (string)WFM::Args(0); - if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) - param = (map) WFM::Args(1); +// Check arguments: +if( size( WFM::Args() ) > 0 + && is( WFM::Args(0), string ) + ) +{ func = (string)WFM::Args(0); + if( size( WFM::Args() ) > 1 + && is( WFM::Args(1), map ) + ) + { param = (map)WFM::Args(1); + } } y2milestone("Printer auto func='%1'", func); y2milestone("Printer auto param='%1'", param); @@ -352,7 +357,7 @@ } return true; } -/* Unknown function */ +// Unknown function: else { y2error("Unknown function: %1", func); ret = false; Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp… ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Fri Feb 4 14:57:22 2011 @@ -43,15 +43,29 @@ import "Service"; import "Popup"; -/* The main () */ y2milestone("----------------------------------------"); y2milestone("Printer proposal started"); -string func = (string) WFM::Args(0); -map param = (map) WFM::Args(1); -map ret = $[]; +any ret = nil; +string func = ""; +map param = $[]; -/* create a textual proposal and write it instantly to the system */ +// Check arguments: +if( size( WFM::Args() ) > 0 + && is( WFM::Args(0), string ) + ) +{ func = (string)WFM::Args(0); + if( size( WFM::Args() ) > 1 + && is( WFM::Args(1), map ) + ) + { param = (map)WFM::Args(1); + } +} +y2milestone("Printer proposal func='%1'", func); +y2milestone("Printer proposal param='%1'", param); + + +// Create a textual proposal and write it instantly to the system: if( func == "MakeProposal" ) { list<string> proposal = []; string warning = nil; @@ -69,7 +83,7 @@ // and skip the automated queue setup if one of them is missing, see // https://bugzilla.novell.com/show_bug.cgi?id=445719#c13 // If cups-client is missing, it would run into an endless sequence of errors. - // If cups is missing, theer can be no local running cupsd which is + // If cups is missing, there can be no local running cupsd which is // mandatory to set up local print queues. if( ! Printerlib::TestAndInstallPackage( "cups-client", "installed" ) ) { y2milestone("Skipped automated queue setup because the package cups-client is not installed."); @@ -181,12 +195,16 @@ } else { y2milestone("Local printers detected, will set up queues for them:"); + list<string> initially_existing_queues = []; list<string> already_set_up_uris = []; // An empty list of autodetected queues is the fallback which is correct: Printer::AutodetectQueues(); foreach( map< string, string > queue, Printer::queues, - { if( "" != queue["uri"]:"" ) + { if( "" != queue["name"]:"" ) + { initially_existing_queues = add( initially_existing_queues, queue["name"]:"" ); + } + if( "" != queue["uri"]:"" ) { already_set_up_uris = add( already_set_up_uris, queue["uri"]:"" ); } } @@ -241,6 +259,16 @@ string default_paper_size = ""; if( Printer::AddQueue( queue_name, is_default_queue, default_paper_size ) ) { already_set_up_uris = add( already_set_up_uris, uri ); + // Since CUPS 1.4 the new DirtyCleanInterval directive controls + // the delay when cupsd updates config files (see basicadd.ycp). + if( ! Printerlib::WaitForUpdatedConfigFiles( _("Creating New Printer Setup") ) ) + { // It returns false if the user had interrupted the waiting for updated config files: + Popup::ErrorDetails( // Message of a Popup::ErrorDetails: + _("New Printer Configuration not yet Stored in the System"), + // Explanation details of a Popup::ErrorDetails. + _("This may result broken printer configurations.") + ); + } // Autodetect queues again so that Printer::NewQueueName // can compare with existing queue names but ignore whatever failures // (an empty list of autodetected queues is the fallback result): @@ -261,7 +289,18 @@ // has almost no additional space between table columns: string name = String::CutBlanks(queue[2]:""); string description = String::CutBlanks(queue[3]:""); - proposal = add( proposal, name + ": " + description ); + string configuration = name; + if( description != "" ) + { configuration = configuration + " : " + description; + } + if( contains( initially_existing_queues, name ) ) + { // The automated printer setup found an already existing configuration: + proposal = add( proposal, _("Found existing configuration") + " : " + configuration ); + } + else + { // The automated printer setup created a new configuration: + proposal = add( proposal, _("Created configuration") + " : " + configuration ); + } } ); } @@ -278,7 +317,7 @@ "warning" : warning, ]; } -/* run the full printer module dialogs */ +// Run the full printer module dialogs: else if(func == "AskUser") { // Call Printer::Read() here (compare "MakeProposal" above) // to make sure that when the full printer module dialogs are launched @@ -296,7 +335,7 @@ y2debug("seq=%1",seq); ret = $[ "workflow_sequence" : seq ]; } -/* create titles */ +// Create titles: else if(func == "Description") { ret = $[ /* Rich text title for Printer in proposals */ "rich_text_title" : _("Printer"), @@ -305,7 +344,7 @@ "id" : "printer", ]; } -/* write the proposal */ +// Dummy function to write the proposal (it is already written in the "MakeProposal" function): else if(func == "Write") { // There is no need to call Printer::Write() here because // it does actually nothing except to exit verbosely, see @@ -313,12 +352,11 @@ // for background information. y2milestone("No need to call Printer::Write() because it does nothing."); } -/* unknown function */ +// Unknown function: else -{ y2error("unknown function: %1", func); +{ y2error("Unknown function: %1", func); } -/* Finish */ y2debug("ret=%1",ret); y2milestone("Printer proposal finished"); y2milestone("----------------------------------------"); Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=6334… ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Fri Feb 4 14:57:22 2011 @@ -72,6 +72,16 @@ _("&Allow remote access"), initial_allow_remote_access ) + ), + `Left + ( `HBox + ( `HSpacing( 2 ), + `Label + ( `id(`allow_remote_access_label), + // A label which explains how the subsequent choices can be used: + _("There are various ways how to specify which remote hosts are allowed:") + ) + ) ) ) ), @@ -95,7 +105,7 @@ ( `id(`publish_to_local_network_check_box), `opt(`notify), // A CheckBox label to publish local print queues by default within the local network: - _("&Publish printers by default within the local network"), + _("&Publish printers within the local network"), initial_publish_to_local_network ) ) @@ -105,7 +115,7 @@ ( `id(`interface_table_label), // A caption for a table to allow remote access to local print queues // via network interfaces specified in the table below: - _("Via network interfaces specified below") + _("Via network interfaces") ) ), `HBox @@ -122,7 +132,7 @@ // A table column header where the column shows whether or not // local print queues are published by default // via the network interface in the other table column: - _("Publish printers by default via this interface") + _("Publish printers via this interface") ), initial_interface_table_items ) @@ -154,7 +164,7 @@ ( `id(`specific_addresses_label), // A caption to allow remote access to local print queues // for hosts and/or networks specified in two TextEntries below: - _("For Experts: Optional Specific IP Addresses or Networks") + _("For Specific IP Addresses or Networks") ) ), `HBox @@ -165,7 +175,7 @@ ( `id(`allow_input), // TextEntry to allow remote access to local print queues // for hosts and/or networks: - _("Allow remote access from those IP addresses or &network/netmask (separated by space)") + _("Allow access from those IP addresses or &network/netmask (separated by space)") ) ), `Left @@ -572,6 +582,7 @@ // with a local running cupsd (e.g. before he set up the first local queue: // Also the basic buttons "Help", "Cancel", "OK" are enabled. UI::ChangeWidget( `allow_remote_access_radio_button, `Enabled, false ); + UI::ChangeWidget( `allow_remote_access_label, `Enabled, false ); UI::ChangeWidget( `allow_local_network_access_check_box, `Enabled, false ); UI::ChangeWidget( `publish_to_local_network_check_box, `Enabled, false ); UI::ChangeWidget( `interface_table_label, `Enabled, false ); @@ -984,6 +995,7 @@ // does not trigger any event even not with "`opt(`notify, `immediate)" // so that this special action is unnoticed. boolean remote_access = (boolean)UI::QueryWidget( `allow_remote_access_radio_button, `Value ); + UI::ChangeWidget( `allow_remote_access_label, `Enabled, remote_access ); UI::ChangeWidget( `allow_local_network_access_check_box, `Enabled, remote_access ); UI::ChangeWidget( `publish_to_local_network_check_box, `Enabled, remote_access ); UI::ChangeWidget( `interface_table_label, `Enabled, remote_access ); -- 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] r63346 - in /branches/tmp/jsuchome/snapper/agent-snapper/src: SnapperAgent.cc SnapperAgent.h
by aschnell＠svn2.opensuse.org 04 Feb '11

04 Feb '11

Author: aschnell Date: Fri Feb 4 13:15:44 2011 New Revision: 63346 URL: http://svn.opensuse.org/viewcvs/yast?rev=63346&view=rev Log: - adapted to libsnapper Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.h Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agent-sn… ============================================================================== --- branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc (original) +++ branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.cc Fri Feb 4 13:15:44 2011 @@ -50,6 +50,7 @@ */ SnapperAgent::SnapperAgent() : SCRAgent() { + sh = createSnapper(); } /** @@ -57,6 +58,7 @@ */ SnapperAgent::~SnapperAgent() { + deleteSnapper(sh); } @@ -95,7 +97,7 @@ */ if (PC(0) == "snapshots") { YCPList retlist; - const Snapshots& snapshots = getSnapper()->getSnapshots(); + const Snapshots& snapshots = sh->getSnapshots(); for (Snapshots::const_iterator it = snapshots.begin(); it != snapshots.end(); ++it) { YCPMap s; @@ -130,14 +132,11 @@ unsigned int num1 = getIntValue (argmap, "from", 0); unsigned int num2 = getIntValue (argmap, "to", 0); - Snapper* sh = getSnapper(); - const Snapshots& snapshots = sh->getSnapshots(); sh->setComparisonNums(snapshots.find(num1), snapshots.find(num2)); const Files& files = sh->getFiles(); - - for (vector<File>::const_iterator it = files.begin(); it != files.end(); ++it) + for (Files::const_iterator it = files.begin(); it != files.end(); ++it) { // cout << statusToString(it->getPreToPostStatus()) << " " << it->getName() << endl; y2internal ("file :%s ", it->getName().c_str ()); Modified: branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agent-sn… ============================================================================== --- branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.h (original) +++ branches/tmp/jsuchome/snapper/agent-snapper/src/SnapperAgent.h Fri Feb 4 13:15:44 2011 @@ -13,8 +13,9 @@ #include <Y2.h> #include <scr/SCRAgent.h> -#include <snapper/Snapshot.h> #include <snapper/Snapper.h> +#include <snapper/Factory.h> +#include <snapper/Snapshot.h> #include <snapper/File.h> /** @@ -84,6 +85,11 @@ * Used for mounting the agent. */ virtual YCPValue otherCommand(const YCPTerm& term); + +private: + + snapper::Snapper* sh; + }; #endif /* _SnapperAgent_h */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0