December 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62992 - in /trunk/gtk/src/pkg: CMakeLists.txt YGPackageSelector.h
by rpmcruz＠svn2.opensuse.org 15 Dec '10

15 Dec '10

Author: rpmcruz Date: Wed Dec 15 04:38:54 2010 New Revision: 62992 URL: http://svn.opensuse.org/viewcvs/yast?rev=62992&view=rev Log: Re-enabled vestigial dialog. Modified: trunk/gtk/src/pkg/CMakeLists.txt trunk/gtk/src/pkg/YGPackageSelector.h Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=6… ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Wed Dec 15 04:38:54 2010 @@ -17,9 +17,9 @@ ygtkpkgsearchentry.cc ygtkpkgstatusbar.cc ygtkpkgundolist.cc - #ygtkpkgvestigialdialog.cc yzypptags.cc yzyppwrapper.cc + ygtkpkgvestigialdialog.cc ygtkcellrendererbutton.c ygtkcellrenderersidebutton.c Modified: trunk/gtk/src/pkg/YGPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.h?… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.h (original) +++ trunk/gtk/src/pkg/YGPackageSelector.h Wed Dec 15 04:38:54 2010 @@ -13,7 +13,7 @@ #include "YGWidget.h" #include "yzyppwrapper.h" -//#define HAS_VESTIGIAL_DIALOG +#define HAS_VESTIGIAL_DIALOG struct YGtkPkgUndoList; struct YGtkPkgSearchEntry; -- 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] r62991 - in /branches/tmp/jsuchome/snapper/src: Snapper.ycp dialogs.ycp
by jsuchome＠svn2.opensuse.org 14 Dec '10

14 Dec '10

Author: jsuchome Date: Tue Dec 14 18:10:19 2010 New Revision: 62991 URL: http://svn.opensuse.org/viewcvs/yast?rev=62991&view=rev Log: read the real data (WIP) 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 Dec 14 18:10:19 2010 @@ -34,15 +34,83 @@ module "Snapper"; textdomain "snapper"; +import "FileUtils"; import "Progress"; -import "Report"; -import "Summary"; -import "Message"; - global list<map> snapshots = []; +global string snapshots_path = "/snapshots"; // FIXME + +global map selected_snapshot = $[]; + +/** + * Return list of files modified in current snapshot + */ +global list<string> ReadModifiedFiles (string snapshot) { + + list<string> 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 = ""; + ret = splitstring (files, "\n"); + } + return ret; +} + + +/** + * Read the list of snapshots + */ +global boolean ReadSnapshots () { + + map out = (map) SCR::Execute (.target.bash_output, "btrfs subvolume list /"); + y2internal ("out: %1", out); + + 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); + }); + return true; +} + /** * Read all snapper settings * @return true on success @@ -70,18 +138,7 @@ Progress::NextStage(); // read database - snapshots = [ - $[ - "name" : "first", - "description" : "description of first snapshot", - "date" : "2010-10-10", - ], - $[ - "name" : "second", - "description" : "YaST Users called", - "date" : "2010-11-11", - ] - ]; + ReadSnapshots (); Progress::NextStage(); return true; 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 Dec 14 18:10:19 2010 @@ -31,6 +31,7 @@ textdomain "snapper"; +import "Confirm"; import "Label"; import "Popup"; import "Wizard"; @@ -47,6 +48,10 @@ * @return `abort if aborted and `next otherwise */ symbol ReadDialog() { + + if (! Confirm::MustBeRoot ()) + return `abort; + Wizard::RestoreHelp(HELPS["read"]:""); boolean ret = Snapper::Read(); return ret ? `next : `abort; @@ -72,8 +77,10 @@ string caption = _("Snapshots"); list<map> snapshots = Snapper::snapshots; + integer i = -1; list snapshot_items = maplist (map s, snapshots, ``{ - return `item (`id (s["name"]:""), s["date"]:"", s["name"]:"", s["description"]:""); + i = i + 1; + return `item (`id (i), s["date"]:"", s["name"]:"", s["description"]:""); }); term contents = `VBox ( @@ -83,7 +90,6 @@ snapshot_items ), `HBox ( -// `PushButton (`id (`add), Label::NewButton ()), `PushButton (`id (`show), _("Show Changes")), `PushButton (`id (`edit), _("Edit Snapshot")), `Right (`PushButton (`id (`rollback), _("Rollback"))) @@ -106,6 +112,8 @@ else continue; } else if (ret == `add || ret == `show) { + integer selected = (integer) UI::QueryWidget (`id (`snapshots_table), `CurrentItem); + Snapper::selected_snapshot = snapshots[selected]:$[]; break; } else if(ret == `next) { @@ -146,10 +154,17 @@ // information about selected file map file_data = $[]; + list<string> file_list = Snapper::selected_snapshot["files"]:[]; + foreach (string file, file_list, { + // FIXME + }); + // FIXME how to get list of top directories? + /* tree_items = maplist (string dir, [ "/etc", "/opt", "/var", "/tmp"], { return `item (`id(dir), dir, false, []); }); + */ // helper for set_tree_term function: create new items for subtrees define list<term> update_items (list<term> its) { -- 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] r62990 - /branches/tmp/jsuchome/snapper/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 14 Dec '10

14 Dec '10

Author: jsuchome Date: Tue Dec 14 14:42:05 2010 New Revision: 62990 URL: http://svn.opensuse.org/viewcvs/yast?rev=62990&view=rev Log: fake data, no Add button 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 Tue Dec 14 14:42:05 2010 @@ -39,7 +39,7 @@ include "snapper/helps.ycp"; boolean ReallyAbort() { - return Popup::ReallyAbort(true); + return true;//FIXME Popup::ReallyAbort(true); } /** @@ -83,9 +83,9 @@ snapshot_items ), `HBox ( - `PushButton (`id (`add), Label::NewButton ()), - `PushButton (`id (`show), _("Show")), - `PushButton (`id (`edit), Label::EditButton ()), +// `PushButton (`id (`add), Label::NewButton ()), + `PushButton (`id (`show), _("Show Changes")), + `PushButton (`id (`edit), _("Edit Snapshot")), `Right (`PushButton (`id (`rollback), _("Rollback"))) ) ); @@ -130,7 +130,7 @@ term contents = `HBox ( `HWeight (1, `ReplacePoint (`id (`treeContents), `Top (`HBox ()))), - `HWeight (2, `ReplacePoint (`id (`entryContents), `Top (`HBox ()))) + `HWeight (1, `ReplacePoint (`id (`entryContents), `Top (`HBox ()))) ); map display_info = UI::GetDisplayInfo (); boolean textmode = display_info["TextMode"]:false; @@ -254,7 +254,11 @@ if (! files[current]:false) { UI::BusyCursor (); - subtree = []; // FIXME read files under current + // FIXME read files under current + subtree = [ + current + "/some file", + current + "/some other file" + ]; files [current] = true; if (size (subtree) > 0) @@ -270,7 +274,7 @@ current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); if (current == nil) current = ""; } - file_data = // FIXME read data for current item + file_data = $[]; // FIXME read data for current item set_entry_term (); UI::NormalCursor (); if (textmode) -- 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] r62989 - /branches/tmp/jsuchome/snapper/src/Makefile.am
by jsuchome＠svn2.opensuse.org 13 Dec '10

13 Dec '10

Author: jsuchome Date: Mon Dec 13 18:54:10 2010 New Revision: 62989 URL: http://svn.opensuse.org/viewcvs/yast?rev=62989&view=rev Log: less files Modified: branches/tmp/jsuchome/snapper/src/Makefile.am Modified: branches/tmp/jsuchome/snapper/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Make… ============================================================================== --- branches/tmp/jsuchome/snapper/src/Makefile.am (original) +++ branches/tmp/jsuchome/snapper/src/Makefile.am Mon Dec 13 18:54:10 2010 @@ -3,23 +3,18 @@ yncludedir = @yncludedir@/snapper client_DATA = \ - snapper.ycp \ - snapper_auto.ycp \ - snapper_proposal.ycp + snapper.ycp ynclude_DATA = \ helps.ycp \ wizards.ycp \ - dialogs.ycp \ - complex.ycp + dialogs.ycp desktop_DATA = \ snapper.desktop module_DATA = \ - Snapper.ycp \ - Snapper2.pm \ - Snapper3.py + Snapper.ycp # create a symlink for local build, #145327 snapper: -- 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] r62988 - in /branches/tmp/jsuchome/snapper: ./ agents/ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by jsuchome＠svn2.opensuse.org 13 Dec '10

13 Dec '10

Author: jsuchome Date: Mon Dec 13 18:53:37 2010 New Revision: 62988 URL: http://svn.opensuse.org/viewcvs/yast?rev=62988&view=rev Log: YaST module for filesystem snapshots manipulations Added: branches/tmp/jsuchome/snapper/ branches/tmp/jsuchome/snapper/MAINTAINER branches/tmp/jsuchome/snapper/Makefile.cvs branches/tmp/jsuchome/snapper/RPMNAME branches/tmp/jsuchome/snapper/VERSION branches/tmp/jsuchome/snapper/_cvsignore branches/tmp/jsuchome/snapper/agents/ branches/tmp/jsuchome/snapper/agents/Makefile.am branches/tmp/jsuchome/snapper/agents/_cvsignore branches/tmp/jsuchome/snapper/configure.in.in branches/tmp/jsuchome/snapper/doc/ branches/tmp/jsuchome/snapper/doc/Makefile.am branches/tmp/jsuchome/snapper/doc/_cvsignore branches/tmp/jsuchome/snapper/doc/autodocs/ branches/tmp/jsuchome/snapper/doc/autodocs/Makefile.am branches/tmp/jsuchome/snapper/doc/autodocs/_cvsignore branches/tmp/jsuchome/snapper/package/ branches/tmp/jsuchome/snapper/package/_cvsignore branches/tmp/jsuchome/snapper/package/yast2-snapper.changes branches/tmp/jsuchome/snapper/src/ branches/tmp/jsuchome/snapper/src/Makefile.am branches/tmp/jsuchome/snapper/src/Snapper.ycp (with props) branches/tmp/jsuchome/snapper/src/_cvsignore branches/tmp/jsuchome/snapper/src/dialogs.ycp (with props) branches/tmp/jsuchome/snapper/src/helps.ycp (with props) branches/tmp/jsuchome/snapper/src/snapper.desktop branches/tmp/jsuchome/snapper/src/snapper.ycp (with props) branches/tmp/jsuchome/snapper/src/wizards.ycp (with props) branches/tmp/jsuchome/snapper/testsuite/ branches/tmp/jsuchome/snapper/testsuite/Makefile.am branches/tmp/jsuchome/snapper/testsuite/_cvsignore branches/tmp/jsuchome/snapper/testsuite/tests/ branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.err branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.out branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.ycp (with props) branches/tmp/jsuchome/snapper/testsuite/tests/_cvsignore branches/tmp/jsuchome/snapper/yast2-snapper.spec.in Added: branches/tmp/jsuchome/snapper/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/MAINTAIN… ============================================================================== --- branches/tmp/jsuchome/snapper/MAINTAINER (added) +++ branches/tmp/jsuchome/snapper/MAINTAINER Mon Dec 13 18:53:37 2010 @@ -0,0 +1 @@ +Jiri Suchomel <jsuchome(a)suse.cz> Added: branches/tmp/jsuchome/snapper/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/Makefile… ============================================================================== --- branches/tmp/jsuchome/snapper/Makefile.cvs (added) +++ branches/tmp/jsuchome/snapper/Makefile.cvs Mon Dec 13 18:53:37 2010 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: branches/tmp/jsuchome/snapper/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/RPMNAME?… ============================================================================== --- branches/tmp/jsuchome/snapper/RPMNAME (added) +++ branches/tmp/jsuchome/snapper/RPMNAME Mon Dec 13 18:53:37 2010 @@ -0,0 +1 @@ +yast2-snapper Added: branches/tmp/jsuchome/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/VERSION?… ============================================================================== --- branches/tmp/jsuchome/snapper/VERSION (added) +++ branches/tmp/jsuchome/snapper/VERSION Mon Dec 13 18:53:37 2010 @@ -0,0 +1 @@ +2.15.0 Added: branches/tmp/jsuchome/snapper/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/_cvsigno… ============================================================================== --- branches/tmp/jsuchome/snapper/_cvsignore (added) +++ branches/tmp/jsuchome/snapper/_cvsignore Mon Dec 13 18:53:37 2010 @@ -0,0 +1,20 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +config.cache +config.guess +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +missing +mkinstalldirs +stamp-h +snapper.pot +autom4te.cache Added: branches/tmp/jsuchome/snapper/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agents/M… ============================================================================== --- branches/tmp/jsuchome/snapper/agents/Makefile.am (added) +++ branches/tmp/jsuchome/snapper/agents/Makefile.am Mon Dec 13 18:53:37 2010 @@ -0,0 +1,7 @@ +# Makefile.am for snapper/agents + +agent_SCRIPTS = + +scrconf_DATA = + +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: branches/tmp/jsuchome/snapper/agents/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/agents/_… ============================================================================== --- branches/tmp/jsuchome/snapper/agents/_cvsignore (added) +++ branches/tmp/jsuchome/snapper/agents/_cvsignore Mon Dec 13 18:53:37 2010 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: branches/tmp/jsuchome/snapper/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/configur… ============================================================================== --- branches/tmp/jsuchome/snapper/configure.in.in (added) +++ branches/tmp/jsuchome/snapper/configure.in.in Mon Dec 13 18:53:37 2010 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: branches/tmp/jsuchome/snapper/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/doc/Make… ============================================================================== --- branches/tmp/jsuchome/snapper/doc/Makefile.am (added) +++ branches/tmp/jsuchome/snapper/doc/Makefile.am Mon Dec 13 18:53:37 2010 @@ -0,0 +1,10 @@ +# Makefile.am for snapper/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: branches/tmp/jsuchome/snapper/doc/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/doc/_cvs… ============================================================================== --- branches/tmp/jsuchome/snapper/doc/_cvsignore (added) +++ branches/tmp/jsuchome/snapper/doc/_cvsignore Mon Dec 13 18:53:37 2010 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: branches/tmp/jsuchome/snapper/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/doc/auto… ============================================================================== --- branches/tmp/jsuchome/snapper/doc/autodocs/Makefile.am (added) +++ branches/tmp/jsuchome/snapper/doc/autodocs/Makefile.am Mon Dec 13 18:53:37 2010 @@ -0,0 +1,3 @@ +# Makefile.am for snapper/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: branches/tmp/jsuchome/snapper/doc/autodocs/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/doc/auto… ============================================================================== --- branches/tmp/jsuchome/snapper/doc/autodocs/_cvsignore (added) +++ branches/tmp/jsuchome/snapper/doc/autodocs/_cvsignore Mon Dec 13 18:53:37 2010 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: branches/tmp/jsuchome/snapper/package/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/package/… ============================================================================== --- branches/tmp/jsuchome/snapper/package/_cvsignore (added) +++ branches/tmp/jsuchome/snapper/package/_cvsignore Mon Dec 13 18:53:37 2010 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: branches/tmp/jsuchome/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/package/… ============================================================================== --- branches/tmp/jsuchome/snapper/package/yast2-snapper.changes (added) +++ branches/tmp/jsuchome/snapper/package/yast2-snapper.changes Mon Dec 13 18:53:37 2010 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Mon Dec 13 18:51:43 2010 - jsuchome(a)suse.cz + +- initial version Added: branches/tmp/jsuchome/snapper/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/Make… ============================================================================== --- branches/tmp/jsuchome/snapper/src/Makefile.am (added) +++ branches/tmp/jsuchome/snapper/src/Makefile.am Mon Dec 13 18:53:37 2010 @@ -0,0 +1,31 @@ +# Makefile.am for snapper/src + +yncludedir = @yncludedir@/snapper + +client_DATA = \ + snapper.ycp \ + snapper_auto.ycp \ + snapper_proposal.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp \ + complex.ycp + +desktop_DATA = \ + snapper.desktop + +module_DATA = \ + Snapper.ycp \ + Snapper2.pm \ + Snapper3.py + +# create a symlink for local build, #145327 +snapper: + ln -sf . $@ +ycpchook = snapper + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: 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 (added) +++ branches/tmp/jsuchome/snapper/src/Snapper.ycp Mon Dec 13 18:53:37 2010 @@ -0,0 +1,125 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: modules/Snapper.ycp + * Summary: Snapper settings, input and output functions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Representation of the configuration of snapper. + * Input and output routines. + */ + +{ + +module "Snapper"; +textdomain "snapper"; + +import "Progress"; +import "Report"; +import "Summary"; +import "Message"; + + + +global list<map> snapshots = []; + +/** + * Read all snapper settings + * @return true on success + */ +global boolean Read() { + + /* Snapper read dialog caption */ + string caption = _("Initializing Snapper"); + + integer steps = 2; + + // We do not set help text here, because it was set outside + Progress::New( caption, " ", steps, [ + /* Progress stage 1/3 */ + _("Read the list of snapshots"), + ], [ + /* Progress step 1/3 */ + _("Reading the database..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + Progress::NextStage(); + // read database + + snapshots = [ + $[ + "name" : "first", + "description" : "description of first snapshot", + "date" : "2010-10-10", + ], + $[ + "name" : "second", + "description" : "YaST Users called", + "date" : "2010-11-11", + ] + ]; + + Progress::NextStage(); + return true; +} + +/** + * Write all snapper settings + * @return true on success + */ +global boolean Write() { + + /* Snapper read dialog caption */ + string caption = _("Saving snapper Configuration"); + + integer steps = 2; + + Progress::New(caption, " ", steps, [ + /* Progress stage 1/2 */ + _("Write the settings"), + /* Progress stage 2/2 */ + _("Run SuSEconfig") + ], [ + /* Progress step 1/2 */ + _("Writing the settings..."), + /* Progress step 2/2 */ + _("Running SuSEconfig..."), + /* Progress finished */ + _("Finished") + ], + "" + ); + + Progress::NextStage(); + Progress::NextStage (); + Progress::NextStage(); + return true; +} + + +/* EOF */ +} Added: branches/tmp/jsuchome/snapper/src/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/_cvs… ============================================================================== --- branches/tmp/jsuchome/snapper/src/_cvsignore (added) +++ branches/tmp/jsuchome/snapper/src/_cvsignore Mon Dec 13 18:53:37 2010 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: 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 (added) +++ branches/tmp/jsuchome/snapper/src/dialogs.ycp Mon Dec 13 18:53:37 2010 @@ -0,0 +1,332 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/snapper/dialogs.ycp + * Package: Configuration of snapper + * Summary: Dialogs definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "snapper"; + +import "Label"; +import "Popup"; +import "Wizard"; +import "Snapper"; + +include "snapper/helps.ycp"; + +boolean ReallyAbort() { + return Popup::ReallyAbort(true); +} + +/** + * Read settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); + boolean ret = Snapper::Read(); + return ret ? `next : `abort; +} + +/** + * Write settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol WriteDialog() { + Wizard::RestoreHelp(HELPS["write"]:""); + boolean ret = Snapper::Write(); + return ret ? `next : `abort; +} + +/** + * Summary dialog + * @return dialog result + */ +any SummaryDialog() { + + /* summary dialog caption */ + string caption = _("Snapshots"); + + list<map> snapshots = Snapper::snapshots; + list snapshot_items = maplist (map s, snapshots, ``{ + return `item (`id (s["name"]:""), s["date"]:"", s["name"]:"", s["description"]:""); + }); + + term contents = `VBox ( + `Table (`id (`snapshots_table), `opt(`notify), `header ( + // table header + _("Date"), _("Name"), _("Description")), + snapshot_items + ), + `HBox ( + `PushButton (`id (`add), Label::NewButton ()), + `PushButton (`id (`show), _("Show")), + `PushButton (`id (`edit), Label::EditButton ()), + `Right (`PushButton (`id (`rollback), _("Rollback"))) + ) + ); + + Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", + Label::BackButton(), Label::FinishButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + if (ret == `snapshots_table) { + ret = `show; + } + if(ret == `abort || ret == `cancel || ret == `back) { + if(ReallyAbort()) break; + else continue; + } + else if (ret == `add || ret == `show) { + break; + } + else if(ret == `next) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/** + * @return dialog result + */ +any ShowDialog () { + + // dialog caption + string caption = _("Selected Snapshot Overview"); + + term contents = `HBox ( + `HWeight (1, `ReplacePoint (`id (`treeContents), `Top (`HBox ()))), + `HWeight (2, `ReplacePoint (`id (`entryContents), `Top (`HBox ()))) + ); + map display_info = UI::GetDisplayInfo (); + boolean textmode = display_info["TextMode"]:false; + string current = ""; + + // map of already read files + map<string,boolean> files = $[]; + // currently read subtree + list<string> subtree = []; + list<term> tree_items = []; + map open_items = $[]; + string root = "/"; + // information about selected file + map file_data = $[]; + + // FIXME how to get list of top directories? + tree_items = maplist (string dir, [ "/etc", "/opt", "/var", "/tmp"], { + return `item (`id(dir), dir, false, []); + }); + + // helper for set_tree_term function: create new items for subtrees + define list<term> update_items (list<term> its) { + + return maplist (term it, its, { + string file = it[0,0]:""; + if (file == current) + { + return `item (`id(file), file, true, + maplist (string k, subtree, ``( + `item (`id(k), k, false, [])) + ) + ); + } + integer last = size (it) - 1; + if (size (it[last]:[]) == 0) + return it; + // `OpenItems doesn't work in ncurses... + boolean open = haskey (open_items, file) && !textmode; + return `item ( + `id(file), file, open, update_items (it[last]:[])); + }); + } + + // create the term with filesystem tree + define void set_tree_term () { + + term cont = `HBox (`VSpacing (20), `VBox (`HSpacing(70), + `VSpacing (0.2), + `HBox ( + `HSpacing (), + `ReplacePoint (`id (`reptree), `Tree (`id(`tree), root, [])), + `ReplacePoint (`id (`repbuttons), `Empty ()), + `HSpacing () + ), + `HBox ( + `HSpacing (1.5), + `HStretch (), + textmode ? + // button label + `PushButton (`id (`open), `opt (`key_F6),_("&Open")): + `Empty (), + `HSpacing (1.5) + ), + `VSpacing (0.6) + )); + + UI::ReplaceWidget (`treeContents, cont); + + if (size (tree_items) > 0) + { + UI::ReplaceWidget (`id (`reptree), textmode ? + `Tree (`id(`tree), root, tree_items) : + `Tree (`id(`tree), `opt(`notify), root, tree_items)); + // no item is selected + UI::ChangeWidget (`tree, `CurrentItem, nil); + } + + if (textmode) + UI::SetFocus (`id(`tree)); + + if (current != "") + UI::ChangeWidget (`id(`tree), `CurrentItem, current); + } + + // create the term for selected file + define void set_entry_term () { + + list items = []; + + term cont = `Label ("info about " + current); + + UI::ReplaceWidget (`entryContents, cont); + + } + + Wizard::SetContentsButtons(caption, contents, HELPS["show"]:"", + Label::BackButton(), Label::NextButton()); + + set_tree_term (); + + current = (string) UI::QueryWidget (`id(`tree), `CurrentItem); + if (current == nil) current = ""; + + set_entry_term (); + if (textmode) + UI::SetFocus (`id(`tree)); + + any ret = nil; + while(true) { + + map event = UI::WaitForEvent (); + ret = (symbol) event["ID"]:nil; + + current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + if (current == nil) + current = ""; + + // events in tree + if (ret == `tree) + { + if (! files[current]:false) + { + UI::BusyCursor (); + subtree = []; // FIXME read files under current + + files [current] = true; + if (size (subtree) > 0) + { + open_items = (map) UI::QueryWidget (`tree, `OpenItems); + tree_items = update_items (tree_items); + UI::ReplaceWidget (`id (`reptree), textmode ? + `Tree (`id(`tree), root, tree_items) : + `Tree (`id(`tree), `opt(`notify), root, tree_items)); + UI::ChangeWidget (`id(`tree), `CurrentItem, current); + open_items = $[]; + } + current = (string) UI::QueryWidget (`id(`tree),`CurrentItem); + if (current == nil) current = ""; + } + file_data = // FIXME read data for current item + set_entry_term (); + UI::NormalCursor (); + if (textmode) + UI::SetFocus (`id(`tree)); + } + else if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} +/** + * @return dialog result + */ +any ConfigureDialog () { + + // dialog caption + string caption = _("Creating Snapshot"); + + term contents = `Label (_("Here, enter data for new snapshot")); + + Wizard::SetContentsButtons(caption, contents, HELPS["add"]:"", + Label::BackButton(), Label::NextButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + + + +/* EOF */ +} Added: 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 (added) +++ branches/tmp/jsuchome/snapper/src/helps.ycp Mon Dec 13 18:53:37 2010 @@ -0,0 +1,61 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/snapper/helps.ycp + * Package: Configuration of snapper + * Summary: Help texts of all the dialogs + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "snapper"; + +/** + * All helps are here + */ +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> +Please wait... +"), + + /* Summary dialog help 1/3 */ + "summary" : _("<big>Snapper Configuration</big> +Configure snapper here. +"), + + /* Add dialog help */ + "add" : _("<big>Creating new snapshot</big> +Press Next to continue. + "), + +]; + +/* EOF */ +} Added: branches/tmp/jsuchome/snapper/src/snapper.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/snap… ============================================================================== --- branches/tmp/jsuchome/snapper/src/snapper.desktop (added) +++ branches/tmp/jsuchome/snapper/src/snapper.desktop Mon Dec 13 18:53:37 2010 @@ -0,0 +1,25 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=snapper + +X-SuSE-YaST-Group=Misc +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=snapper + +Icon=yast-snapper +Exec=/sbin/yast2 snapper + +Name=Snapper +GenericName=snapper +X-KDE-SubstituteUID=true +StartupNotify=true Added: 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 (added) +++ branches/tmp/jsuchome/snapper/src/snapper.ycp Mon Dec 13 18:53:37 2010 @@ -0,0 +1,90 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: clients/snapper.ycp + * Package: Configuration of snapper + * Summary: Main file + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + * + * Main file for snapper configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of snapper</h3> + */ + +textdomain "snapper"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("Snapper module started"); + +import "Progress"; +import "Report"; +import "Summary"; + +import "CommandLine"; +include "snapper/wizards.ycp"; + +map cmdline_description = $[ + "id" : "snapper", + /* Command line help text for the Xsnapper module */ + "help" : _("Configuration of snapper"), + "guihandler" : SnapperSequence, + "initialize" : Snapper::Read, + "finish" : Snapper::Write, + "actions" : $[ + // FIXME TODO: fill the functionality description here + ], + "options" : $[ + // FIXME TODO: fill the option descriptions here + ], + "mappings" : $[ + // FIXME TODO: fill the mappings of actions and options here + ] +]; + +/* is this proposal or not? */ +boolean propose = false; +list args = WFM::Args(); +if(size(args) > 0) { + if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { + y2milestone("Using PROPOSE mode"); + propose = true; + } +} + +/* main ui function */ +any ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("Snapper module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: branches/tmp/jsuchome/snapper/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/src/wiza… ============================================================================== --- branches/tmp/jsuchome/snapper/src/wizards.ycp (added) +++ branches/tmp/jsuchome/snapper/src/wizards.ycp Mon Dec 13 18:53:37 2010 @@ -0,0 +1,133 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/snapper/wizards.ycp + * Package: Configuration of snapper + * Summary: Wizards definitions + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "snapper"; + +import "Sequencer"; +import "Wizard"; + +include "snapper/dialogs.ycp"; + +/** + * Add a configuration of snapper + * @return sequence result + */ +any AddSequence() { + + map aliases = $[ + "config" : ``(ConfigureDialog()), + ]; + + map sequence = $[ + "ws_start" : "config", + "config" : $[ + `abort : `abort, + `next : `next, + ], + ]; + + return Sequencer::Run(aliases, sequence); +} + +/** + * Main workflow of the snapper configuration + * @return sequence result + */ +any MainSequence() { + + map aliases = $[ + "summary" : ``( SummaryDialog() ), + "show" : ``( ShowDialog() ), + "add" : [ ``( AddSequence() ), true ], + ]; + + map sequence = $[ + "ws_start" : "summary", + "summary" : $[ + `abort : `abort, + `next : `next, + `add : "add", + `show : "show", + ], + "add" : $[ + `abort : `abort, + `next : "summary", + ], + "show" : $[ + `abort : `abort, + `next : "summary", + ], + ]; + + any ret = Sequencer::Run(aliases, sequence); + + return ret; +} + +/** + * Whole configuration of snapper + * @return sequence result + */ +any SnapperSequence() { + + map aliases = $[ + "read" : [ ``( ReadDialog() ), true ], + "main" : ``( MainSequence() ), + "write" : [ ``( WriteDialog() ), true ] + ]; + + map sequence = $[ + "ws_start" : "read", + "read" : $[ + `abort : `abort, + `next : "main" + ], + "main" : $[ + `abort : `abort, + `next : "write" + ], + "write" : $[ + `abort : `abort, + `next : `next + ] + ]; + + Wizard::CreateDialog(); + + any ret = Sequencer::Run(aliases, sequence); + + UI::CloseDialog(); + return ret; +} + + +/* EOF */ +} Added: branches/tmp/jsuchome/snapper/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/testsuit… ============================================================================== --- branches/tmp/jsuchome/snapper/testsuite/Makefile.am (added) +++ branches/tmp/jsuchome/snapper/testsuite/Makefile.am Mon Dec 13 18:53:37 2010 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: branches/tmp/jsuchome/snapper/testsuite/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/testsuit… ============================================================================== --- branches/tmp/jsuchome/snapper/testsuite/_cvsignore (added) +++ branches/tmp/jsuchome/snapper/testsuite/_cvsignore Mon Dec 13 18:53:37 2010 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.err URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/testsuit… ============================================================================== (empty) Added: branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/testsuit… ============================================================================== --- branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.out (added) +++ branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.out Mon Dec 13 18:53:37 2010 @@ -0,0 +1,2 @@ +Dump Snapper::Modified +Return false Added: branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/testsuit… ============================================================================== --- branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.ycp (added) +++ branches/tmp/jsuchome/snapper/testsuite/tests/Snapper.ycp Mon Dec 13 18:53:37 2010 @@ -0,0 +1,13 @@ +{ + +// testedfiles: Snapper.ycp + +include "testsuite.ycp"; +TESTSUITE_INIT([], nil); + +import "Snapper"; + +DUMP("Snapper::Modified"); +TEST(``(Snapper::Modified()), [], nil); + +} Added: branches/tmp/jsuchome/snapper/testsuite/tests/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/testsuit… ============================================================================== (empty) Added: branches/tmp/jsuchome/snapper/yast2-snapper.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsuchome/snapper/yast2-sn… ============================================================================== --- branches/tmp/jsuchome/snapper/yast2-snapper.spec.in (added) +++ branches/tmp/jsuchome/snapper/yast2-snapper.spec.in Mon Dec 13 18:53:37 2010 @@ -0,0 +1,31 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of snapper + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/snapper +@yncludedir@/snapper/* +@clientdir@/snapper.ycp +@clientdir@/snapper_*.ycp +@moduledir@/Snapper.* +@moduledir@/Snapper2.* +@desktopdir@/snapper.desktop +%doc @docdir@ -- 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] r62987 - in /branches/SuSE-Code-11-SP1-Branch/gtk: ChangeLog src/YGComboBox.cc
by rpmcruz＠svn2.opensuse.org 09 Dec '10

09 Dec '10

Author: rpmcruz Date: Fri Dec 10 00:40:54 2010 New Revision: 62987 URL: http://svn.opensuse.org/viewcvs/yast?rev=62987&view=rev Log: * src/YGComboBox.cc: bug fix 655977: don't layout combo-box popup menu as a table. Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog branches/SuSE-Code-11-SP1-Branch/gtk/src/YGComboBox.cc Modified: branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/C… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/ChangeLog Fri Dec 10 00:40:54 2010 @@ -1,3 +1,8 @@ +2010-12-09 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGComboBox.cc: bug fix 655977: don't layout + combo-box popup menu as a table. + 2010-03-04 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGWidget.cc: bug fix 583228: misplacing colon Modified: branches/SuSE-Code-11-SP1-Branch/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/gtk/s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/gtk/src/YGComboBox.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/gtk/src/YGComboBox.cc Fri Dec 10 00:40:54 2010 @@ -36,9 +36,6 @@ "pixbuf", YGSelectionModel::ICON_COLUMN, NULL); connect (getWidget(), "changed", G_CALLBACK (selected_changed_cb), this); - // realize doesn't seem reliable -- expose then disconnect - g_signal_connect (G_OBJECT (getWidget()), "expose-event", - G_CALLBACK (realize_cb), this); } inline GtkComboBox *getComboBox() @@ -131,21 +128,6 @@ YGLABEL_WIDGET_IMPL (YComboBox) YGSELECTION_WIDGET_IMPL (YComboBox) - - // callbacks - - static gboolean realize_cb (GtkWidget *widget, GdkEventExpose *event, - YGComboBox *pThis) - { - // some combo boxes have too many items -- wrap the thing in columns - int rows; - pThis->getMaxDepth (&rows); - int cols = MIN (rows / 20, 5) + 1; - if (cols > 1) // this changes the popup width, so only set it for cols > 1 - gtk_combo_box_set_wrap_width (pThis->getComboBox(), cols); - g_signal_handlers_disconnect_by_func (widget, (gpointer) realize_cb, pThis); - return FALSE; - } }; YComboBox *YGWidgetFactory::createComboBox (YWidget *parent, const string &label, bool editable) -- 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] r62986 - /tags/stable-2_21_83/gtk/
by rpmcruz＠svn2.opensuse.org 09 Dec '10

09 Dec '10

Author: rpmcruz Date: Fri Dec 10 00:38:08 2010 New Revision: 62986 URL: http://svn.opensuse.org/viewcvs/yast?rev=62986&view=rev Log: Created tag stable-2_21_83 for gtk Added: tags/stable-2_21_83/gtk/ - copied from r62985, trunk/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62985 - /tags/stable-2_21_83/
by rpmcruz＠svn2.opensuse.org 09 Dec '10

09 Dec '10

Author: rpmcruz Date: Fri Dec 10 00:37:55 2010 New Revision: 62985 URL: http://svn.opensuse.org/viewcvs/yast?rev=62985&view=rev Log: Created tag stable-2_21_83 Added: tags/stable-2_21_83/ -- 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] r62984 - in /trunk/gtk: ./ package/ src/ src/pkg/
by rpmcruz＠svn2.opensuse.org 09 Dec '10

09 Dec '10

Author: rpmcruz Date: Fri Dec 10 00:37:38 2010 New Revision: 62984 URL: http://svn.opensuse.org/viewcvs/yast?rev=62984&view=rev Log: Milestone version. Modified: trunk/gtk/ChangeLog trunk/gtk/VERSION trunk/gtk/VERSION.cmake trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/YGComboBox.cc trunk/gtk/src/YGDialog.cc trunk/gtk/src/pkg/CMakeLists.txt trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/YGPackageSelector.h trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgmenubar.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62984&r1=62983… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Dec 10 00:37:38 2010 @@ -1,5 +1,10 @@ 2010-12-09 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/YGComboBox.cc: bug fix 655977: don't layout + combo-box popup menu as a table. + +2010-12-09 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + * src/pkg/yzyppwrapper.cc: bug fix: when sorting equal attributes maintain previous arranging order. Modified: trunk/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION?rev=62984&r1=62983&r… ============================================================================== --- trunk/gtk/VERSION (original) +++ trunk/gtk/VERSION Fri Dec 10 00:37:38 2010 @@ -1 +1 @@ -2.21.82 +2.21.83 Modified: trunk/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/VERSION.cmake?rev=62984&r1=6… ============================================================================== --- trunk/gtk/VERSION.cmake (original) +++ trunk/gtk/VERSION.cmake Fri Dec 10 00:37:38 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "82") +SET(VERSION_PATCH "83") Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Fri Dec 10 00:37:38 2010 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Dec 09 23:33:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.83 +- fix: can't use combo-box popup menu when items are too +long (bnc#595560). +- table fix: not showing all popup entries on right-click. +- log view fix: fixed flickering, and allow user to freely +scroll. +- sw_single: use same height for "all packages" item, and +keep items sorted by name when sorting by status or another +column. + +------------------------------------------------------------------- Wed Nov 10 18:07:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.82 Modified: trunk/gtk/src/YGComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGComboBox.cc?rev=62984&… ============================================================================== --- trunk/gtk/src/YGComboBox.cc (original) +++ trunk/gtk/src/YGComboBox.cc Fri Dec 10 00:37:38 2010 @@ -21,10 +21,9 @@ { gtk_combo_box_set_model (getComboBox(), getModel()); GtkCellRenderer* cell; - if (editable) { + if (editable) gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (getWidget()), YGSelectionModel::LABEL_COLUMN); - } else { cell = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (getWidget()), cell, TRUE); @@ -37,9 +36,6 @@ "pixbuf", YGSelectionModel::ICON_COLUMN, NULL); connect (getWidget(), "changed", G_CALLBACK (selected_changed_cb), this); - // realize doesn't seem reliable -- expose then disconnect - g_signal_connect (G_OBJECT (getWidget()), "expose-event", - G_CALLBACK (realize_cb), this); } inline GtkComboBox *getComboBox() @@ -130,19 +126,6 @@ static void selected_changed_cb (GtkComboBox *widget, YGComboBox *pThis) { pThis->emitEvent (YEvent::ValueChanged); } - static gboolean realize_cb (GtkWidget *widget, GdkEventExpose *event, - YGComboBox *pThis) - { - // some combo boxes have too many items -- wrap the thing in columns - int rows; - pThis->getMaxDepth (&rows); - int cols = MIN (rows / 20, 5) + 1; - if (cols > 1) // this changes the popup width, so only set it for cols > 1 - gtk_combo_box_set_wrap_width (pThis->getComboBox(), cols); - g_signal_handlers_disconnect_by_func (widget, (gpointer) realize_cb, pThis); - return FALSE; - } - YGLABEL_WIDGET_IMPL (YComboBox) YGSELECTION_WIDGET_IMPL (YComboBox) }; Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=62984&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Fri Dec 10 00:37:38 2010 @@ -25,7 +25,7 @@ //#define DEFAULT_WIDTH 750 //#define DEFAULT_HEIGHT 650 -#define DEFAULT_CHAR_WIDTH 65 +#define DEFAULT_CHAR_WIDTH 62 #define DEFAULT_CHAR_HEIGHT 28 #define DEFAULT_PIXEL_WIDTH 350 #define DEFAULT_PIXEL_HEIGHT 200 Modified: trunk/gtk/src/pkg/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/CMakeLists.txt?rev=6… ============================================================================== --- trunk/gtk/src/pkg/CMakeLists.txt (original) +++ trunk/gtk/src/pkg/CMakeLists.txt Fri Dec 10 00:37:38 2010 @@ -17,7 +17,7 @@ ygtkpkgsearchentry.cc ygtkpkgstatusbar.cc ygtkpkgundolist.cc - ygtkpkgvestigialdialog.cc + #ygtkpkgvestigialdialog.cc yzypptags.cc yzyppwrapper.cc Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Fri Dec 10 00:37:38 2010 @@ -28,7 +28,9 @@ #include "ygtkpkgdetailview.h" #include "ygtkpkghistorydialog.h" +#ifdef HAS_VESTIGIAL_DIALOG #include "ygtkpkgvestigialdialog.h" +#endif //#define USE_LIST_BUTTONS @@ -657,7 +659,10 @@ YGPackageSelector::YGPackageSelector (YWidget *parent, long mode) : YPackageSelector (NULL, mode), YGWidget (this, parent, YGTK_TYPE_WIZARD, NULL), -m_historyDialog (NULL), m_vestigialDialog (NULL) +m_historyDialog (NULL) +#ifdef HAS_VESTIGIAL_DIALOG +, m_vestigialDialog (NULL) +#endif { singleton = this; setBorder (0); @@ -713,7 +718,10 @@ YGPackageSelector::~YGPackageSelector() { - delete m_historyDialog; delete m_vestigialDialog; + delete m_historyDialog; +#ifdef HAS_VESTIGIAL_DIALOG + delete m_vestigialDialog; +#endif delete impl; singleton = 0; } @@ -783,12 +791,14 @@ m_historyDialog->popup(); } +#ifdef HAS_VESTIGIAL_DIALOG void YGPackageSelector::showVestigialDialog() { if (!m_vestigialDialog) m_vestigialDialog = new YGtkPkgVestigialDialog(); m_vestigialDialog->popup(); } +#endif YGtkPkgUndoList *YGPackageSelector::undoList() { return impl->m_undo; } Modified: trunk/gtk/src/pkg/YGPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.h?… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.h (original) +++ trunk/gtk/src/pkg/YGPackageSelector.h Fri Dec 10 00:37:38 2010 @@ -13,6 +13,8 @@ #include "YGWidget.h" #include "yzyppwrapper.h" +//#define HAS_VESTIGIAL_DIALOG + struct YGtkPkgUndoList; struct YGtkPkgSearchEntry; struct YGtkPkgHistoryDialog; @@ -36,7 +38,9 @@ void showRepoManager(); void showHistoryDialog(); +#ifdef HAS_VESTIGIAL_DIALOG void showVestigialDialog(); +#endif YGtkPkgUndoList *undoList(); YGtkPkgSearchEntry *getSearchEntry(); @@ -55,7 +59,9 @@ static YGPackageSelector *singleton; YGtkPkgHistoryDialog *m_historyDialog; +#ifdef HAS_VESTIGIAL_DIALOG YGtkPkgVestigialDialog *m_vestigialDialog; +#endif }; #endif Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Fri Dec 10 00:37:38 2010 @@ -397,7 +397,7 @@ gtk_box_pack_start (GTK_BOX (box), versions_box, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), button_box, FALSE, TRUE, 0); -#if 0 // draw border all around +#if 1 // draw border all around GtkWidget *frame = gtk_frame_new (NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 2); gtk_container_add (GTK_CONTAINER (frame), box); Modified: trunk/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgmenubar.cc?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgmenubar.cc Fri Dec 10 00:37:38 2010 @@ -658,8 +658,10 @@ static void show_log_changes_cb() { YGPackageSelector::get()->showHistoryDialog(); } +#ifdef HAS_VESTIGIAL_DIALOG static void show_vestigial_packages_cb() { YGPackageSelector::get()->showVestigialDialog(); } +#endif static void reset_ignored_dependency_conflicts_cb() { zypp::getZYpp()->resolver()->undo(); } @@ -733,8 +735,10 @@ if (!selector->onlineUpdateMode()) { append_menu_item (submenu, _("Show _History"), NULL, G_CALLBACK (show_log_changes_cb), this); +#ifdef HAS_VESTIGIAL_DIALOG append_menu_item (submenu, _("Show _Unneeded Dependencies"), NULL, G_CALLBACK (show_vestigial_packages_cb), this); +#endif } append_menu_item (submenu, NULL, NULL, NULL, NULL); // Translators: keep "-_devel" untranslated -- 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] r62983 - /tags/branch-SLE-10-SP4-2_13_43/samba-client/
by jsuchome＠svn2.opensuse.org 09 Dec '10

09 Dec '10

Author: jsuchome Date: Thu Dec 9 16:34:44 2010 New Revision: 62983 URL: http://svn.opensuse.org/viewcvs/yast?rev=62983&view=rev Log: Created tag branch-SLE-10-SP4-2_13_43 for samba-client Added: tags/branch-SLE-10-SP4-2_13_43/samba-client/ - copied from r62982, branches/SuSE-SLE-10-SP4-Branch/samba-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0