November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41996 - /branches/tmp/sh/mod-ui/web-wt/src/Makefile.am
by visnov＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: visnov Date: Tue Nov 13 11:17:30 2007 New Revision: 41996 URL: http://svn.opensuse.org/viewcvs/yast?rev=41996&view=rev Log: PushButton skeleton Modified: branches/tmp/sh/mod-ui/web-wt/src/Makefile.am Modified: branches/tmp/sh/mod-ui/web-wt/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/Make… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/web-wt/src/Makefile.am Tue Nov 13 11:17:30 2007 @@ -27,8 +27,9 @@ YWebUI_widgets.cc \ YWebUI_builtins.cc \ YWebWidgetFactory.cc \ - YWebDialog.cc \ - YWebApplication.cc + YWebDialog.cc \ + YWebApplication.cc \ + YWebPushButton.cc # YQPackageSelectorPlugin.cc \ -- 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] r41995 - in /trunk/core/liby2util-r/src: Digest.cc Makefile.am PathInfo.cc include/y2util/Digest.h include/y2util/Makefile.am include/y2util/PathInfo.h
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 10:59:17 2007 New Revision: 41995 URL: http://svn.opensuse.org/viewcvs/yast?rev=41995&view=rev Log: Removed md5sum and sha1sum from PathInfo => Removed Digest and its deps. (It's not dead, it's resting.) Removed: trunk/core/liby2util-r/src/Digest.cc trunk/core/liby2util-r/src/include/y2util/Digest.h Modified: trunk/core/liby2util-r/src/Makefile.am trunk/core/liby2util-r/src/PathInfo.cc trunk/core/liby2util-r/src/include/y2util/Makefile.am trunk/core/liby2util-r/src/include/y2util/PathInfo.h Modified: trunk/core/liby2util-r/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/Makefile.am… ============================================================================== --- trunk/core/liby2util-r/src/Makefile.am (original) +++ trunk/core/liby2util-r/src/Makefile.am Tue Nov 13 10:59:17 2007 @@ -13,7 +13,6 @@ lib_LTLIBRARIES = liby2util.la liby2util_la_SOURCES = \ - Digest.cc \ ExternalDataSource.cc \ ExternalProgram.cc \ MemUsage.cc \ Modified: trunk/core/liby2util-r/src/PathInfo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/PathInfo.cc… ============================================================================== --- trunk/core/liby2util-r/src/PathInfo.cc (original) +++ trunk/core/liby2util-r/src/PathInfo.cc Tue Nov 13 10:59:17 2007 @@ -27,7 +27,6 @@ #include <y2util/ExternalProgram.h> #include <y2util/PathInfo.h> -#include <y2util/Digest.h> using namespace std; @@ -676,42 +675,6 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : PathInfo::md5sum -// METHOD TYPE : std::string -// -std::string PathInfo::md5sum( const Pathname & file ) -{ - if ( ! PathInfo( file ).isFile() ) { - return string(); - } - ifstream istr( file.asString().c_str() ); - if ( ! istr ) { - return string(); - } - return Digest::digest( "MD5", istr ); -} - -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : PathInfo::sha1sum -// METHOD TYPE : std::string -// -std::string PathInfo::sha1sum( const Pathname & file ) -{ - if ( ! PathInfo( file ).isFile() ) { - return string(); - } - ifstream istr( file.asString().c_str() ); - if ( ! istr ) { - return string(); - } - return Digest::digest( "SHA1", istr ); -} - -/////////////////////////////////////////////////////////////////// -// -// // METHOD NAME : PathInfo::erase // METHOD TYPE : int // Modified: trunk/core/liby2util-r/src/include/y2util/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/y2u… ============================================================================== --- trunk/core/liby2util-r/src/include/y2util/Makefile.am (original) +++ trunk/core/liby2util-r/src/include/y2util/Makefile.am Tue Nov 13 10:59:17 2007 @@ -7,7 +7,6 @@ # these go to $(pkgincludedir) pkginclude_HEADERS = \ - Digest.h \ ExternalDataSource.h \ ExternalProgram.h \ MemUsage.h \ Modified: trunk/core/liby2util-r/src/include/y2util/PathInfo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/y2u… ============================================================================== --- trunk/core/liby2util-r/src/include/y2util/PathInfo.h (original) +++ trunk/core/liby2util-r/src/include/y2util/PathInfo.h Tue Nov 13 10:59:17 2007 @@ -331,20 +331,6 @@ **/ static int copy_file2dir( const Pathname & file, const Pathname & dest ); - /** - * Compute a files md5sum. - * - * @return the files md5sum on success, otherwise an empty string.. - **/ - static std::string md5sum( const Pathname & file ); - - /** - * Compute a files sha1sum. - * - * @return the files sha1sum on success, otherwise an empty string.. - **/ - static std::string sha1sum( const Pathname & file ); - /////////////////////////////////////////////////////////////////// // /////////////////////////////////////////////////////////////////// -- 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] r41994 - in /branches/tmp/sh/mod-ui/ncurses/src: README_mod-ui pkg/NCPackageSelector.cc pkg/NCPkgPopupTree.cc pkg/NCPkgPopupTree.h
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 10:56:58 2007 New Revision: 41994 URL: http://svn.opensuse.org/viewcvs/yast?rev=41994&view=rev Log: add class NCRpmGroupItem to build NCTree of rpm groups (tree isn't yet built correctly) Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.h Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Tue Nov 13 10:56:58 2007 @@ -6,6 +6,11 @@ with_threads = false; +YWidget generates a core if the widget is created on stack +---------------------------------------------------------- + + + NCTree ------ YItemIterator itemsBegin()/itemsEnd() used to iterate over toplevel items @@ -105,9 +110,8 @@ NCTable/NCPkgTable ------------------ TODO: initialize header in constructor, set each header item separately - - setHeader(): call YTable::setTableHeader ??? - + setHeader(): call YTable::setTableHeader ??? + NCPopupMenu Common issues: - Use WidgetFactory create methods, e.g. in NCAskForDirectory/File @@ -130,6 +134,3 @@ TODO: hyper links doesn't yet work -NCPkgPopupDiskspace -------------------- -TODO: addItem() for partition table not yet called (NCPkgPopupDiskSpace.cc line 181) Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc Tue Nov 13 10:56:58 2007 @@ -1636,7 +1636,7 @@ info->setNiceSize( 35, 5 ); string selId = getMenuId( event.selection ); - // ( event.selection->compare( NCPkgNames::ShowDeps() ) == YO_EQUAL ) + if ( selId == NCPkgNames::ShowDeps()->toString() ) { bool ok = false; @@ -1647,21 +1647,22 @@ depsPopup->showDependencies( NCPkgPopupDeps::S_Solve, &ok ); } - if ( ok ) + if ( ok ) + { info->showInfoPopup(); + YDialog::deleteTopmostDialog(); + } // update the package list and the disk space info updatePackageList(); showDiskSpace(); } - // else if ( event.selection->compare( NCPkgNames::VerifySystem() ) == YO_EQUAL ) else if ( selId == NCPkgNames::VerifySystem()->toString() ) { verifyPackageDependencies(); updatePackageList(); showDiskSpace(); } - // else if ( event.selection->compare( NCPkgNames::AutoDeps() ) == YO_EQUAL ) else if ( selId == NCPkgNames::AutoDeps()->toString() ) { char menu[2000]; @@ -1862,8 +1863,6 @@ packageList->showInformation(); packageList->setKeyboardFocus(); - YDialog::deleteTopmostDialog(); // delete NCPopupInfo dialog - // return true means: don't leave the event loop in runPkgSelection return true; } @@ -2714,8 +2713,6 @@ NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), this ); NCursesEvent input = autoChangePopup->showInfoPopup(); - YDialog::deleteTopmostDialog(); - if ( input == NCursesEvent::cancel ) { // user clicked on Cancel Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc Tue Nov 13 10:56:58 2007 @@ -29,6 +29,37 @@ #include "NCZypp.h" + + +class NCRpmGroupItem : public YTreeItem { + +private: + YStringTreeItem * rpmGroupItem; + +public: + + NCRpmGroupItem( YTreeItem * parent, + const string & label, + YStringTreeItem * origItem ) + : YTreeItem( parent, label ), + rpmGroupItem( origItem ) + { + + } + + NCRpmGroupItem( const string & label, + YStringTreeItem * origItem ) + : YTreeItem( label ), + rpmGroupItem( origItem ) + { + + } + + YStringTreeItem * getOrigItem() { return rpmGroupItem; } + +}; + + /////////////////////////////////////////////////////////////////// // // @@ -74,8 +105,6 @@ // void NCPkgPopupTree::createLayout( const string & label ) { - YWidgetOpt opt; - opt.notifyMode.setValue( true ); // FIXME //opt.vWeight.setValue( 70 ); @@ -145,21 +174,29 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgPopupTree::niceSize -// METHOD TYPE : void -// -// DESCRIPTION : +// METHOD NAME : NCPkgPopupTree::preferredWidth +// METHOD TYPE : int // +int NCPkgPopupTree::preferredWidth() +{ + return NCurses::cols()/2; +} -long NCPkgPopupTree::nicesize(YUIDimension dim) +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPkgPopupTree::preferredHeight +// METHOD TYPE : int +// +int NCPkgPopupTree::preferredHeight() { - long vdim; + int vdim; if ( NCurses::lines() > 20 ) vdim = 20; else vdim = NCurses::lines()-4; - - return ( dim == YD_HORIZ ? NCurses::cols()/2 : vdim ); + + return vdim; } /////////////////////////////////////////////////////////////////// @@ -247,18 +284,22 @@ // Adds all tree items got from YPkgRpmGroupTagsFilterView to // the filter popup tree // -void NCPkgPopupTree::cloneTree( YStringTreeItem * parentOrig, YTreeItem * parentClone ) +void NCPkgPopupTree::cloneTree( YStringTreeItem * parentOrig, NCRpmGroupItem * parentClone ) { // methods of YStringTreeItem see ../libyui/src/include/TreeItem.h: SortedTreeItem YStringTreeItem * child = parentOrig->firstChild(); - YTreeItem * clone; + NCRpmGroupItem * clone; while ( child ) { - NCDBG << "TRANSLATION: " << child->value().translation() << endl; + NCMIL << "Rpm group (translated): " << child->value().translation() << endl; + + if ( !parentClone ) + clone = new NCRpmGroupItem( child->value().translation(), child ); + else + clone = new NCRpmGroupItem( parentClone, child->value().translation(), child ); - if ( parentClone ) - addItem( parentClone ); + addItem( clone ); clone = parentClone; cloneTree( child, clone ); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.h Tue Nov 13 10:56:58 2007 @@ -32,9 +32,8 @@ #include <y2util/YRpmGroupsTree.h> class NCTree; -class YCPValue; class NCPackageSelector; - +class NCRpmGroupItem; /////////////////////////////////////////////////////////////////// // @@ -54,7 +53,7 @@ NCPackageSelector * packager; // connection to the PackageSelector // internal use (copies tree items) - void cloneTree( YStringTreeItem * parentOrig, YTreeItem * parentClone ); + void cloneTree( YStringTreeItem * parentOrig, NCRpmGroupItem * parentClone ); protected: @@ -71,8 +70,9 @@ NCPkgPopupTree( const wpos at, NCPackageSelector * packager ); virtual ~NCPkgPopupTree(); - virtual long nicesize(YUIDimension dim); - + virtual int preferredWidth(); + virtual int preferredHeight(); + void createLayout( const string & label ); void addItem( YTreeItem * newItem ); -- 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] r41993 - in /trunk/core/liby2util-r: ./ src/ src/include/ src/include/y2util/ testsuite/
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 10:45:16 2007 New Revision: 41993 URL: http://svn.opensuse.org/viewcvs/yast?rev=41993&view=rev Log: Moving active parts of liby2util.rpm into yast2-core.rpm to reduce dependencies (F120312). Added: trunk/core/liby2util-r/ trunk/core/liby2util-r/Makefile.am trunk/core/liby2util-r/src/ trunk/core/liby2util-r/src/Digest.cc - copied unchanged from r41252, trunk/liby2util/src/Digest.cc trunk/core/liby2util-r/src/ExternalDataSource.cc - copied unchanged from r41252, trunk/liby2util/src/ExternalDataSource.cc trunk/core/liby2util-r/src/ExternalProgram.cc - copied unchanged from r41252, trunk/liby2util/src/ExternalProgram.cc trunk/core/liby2util-r/src/Makefile.am trunk/core/liby2util-r/src/MemUsage.cc - copied unchanged from r41252, trunk/liby2util/src/MemUsage.cc trunk/core/liby2util-r/src/PathInfo.cc - copied unchanged from r41252, trunk/liby2util/src/PathInfo.cc trunk/core/liby2util-r/src/Pathname.cc - copied unchanged from r41252, trunk/liby2util/src/Pathname.cc trunk/core/liby2util-r/src/Rep.cc - copied unchanged from r41252, trunk/liby2util/src/Rep.cc trunk/core/liby2util-r/src/Y2SLog.cc - copied unchanged from r41252, trunk/liby2util/src/Y2SLog.cc trunk/core/liby2util-r/src/include/ trunk/core/liby2util-r/src/include/Makefile.am trunk/core/liby2util-r/src/include/y2util/ trunk/core/liby2util-r/src/include/y2util/Digest.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Digest.h trunk/core/liby2util-r/src/include/y2util/ExternalDataSource.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/ExternalDataSource.h trunk/core/liby2util-r/src/include/y2util/ExternalProgram.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/ExternalProgram.h trunk/core/liby2util-r/src/include/y2util/Makefile.am trunk/core/liby2util-r/src/include/y2util/MemUsage.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/MemUsage.h trunk/core/liby2util-r/src/include/y2util/PathInfo.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/PathInfo.h trunk/core/liby2util-r/src/include/y2util/Pathname.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Pathname.h trunk/core/liby2util-r/src/include/y2util/Rep.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Rep.h trunk/core/liby2util-r/src/include/y2util/RepDef.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/RepDef.h trunk/core/liby2util-r/src/include/y2util/Ustring.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Ustring.h trunk/core/liby2util-r/src/include/y2util/Y2SLog.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/Y2SLog.h trunk/core/liby2util-r/src/include/y2util/miniini.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/miniini.h trunk/core/liby2util-r/src/include/y2util/stringutil.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/stringutil.h trunk/core/liby2util-r/src/include/y2util/y2log.h - copied unchanged from r41252, trunk/liby2util/src/include/y2util/y2log.h trunk/core/liby2util-r/src/miniini.cc - copied unchanged from r41252, trunk/liby2util/src/miniini.cc trunk/core/liby2util-r/src/stringutil.cc - copied unchanged from r41252, trunk/liby2util/src/stringutil.cc trunk/core/liby2util-r/src/y2log.cc - copied unchanged from r41252, trunk/liby2util/src/y2log.cc trunk/core/liby2util-r/testsuite/ Added: trunk/core/liby2util-r/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/Makefile.am?rev… ============================================================================== --- trunk/core/liby2util-r/Makefile.am (added) +++ trunk/core/liby2util-r/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1 @@ +SUBDIRS=src Added: trunk/core/liby2util-r/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/Makefile.am… ============================================================================== --- trunk/core/liby2util-r/src/Makefile.am (added) +++ trunk/core/liby2util-r/src/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1,31 @@ +# +# Makefile.am for liby2util/src +# + +SUBDIRS = include + +INCLUDES = -I$(srcdir)/include #-I$(oldincludedir)/libxml2 + +AM_LDFLAGS = -L$(libdir) + +AM_CPPFLAGS = -DY2LOG=\"liby2util\" $(DEBUG_FLAGS) -D_GNU_SOURCE -DLOCALEDIR=\"${localedir}\" + +lib_LTLIBRARIES = liby2util.la + +liby2util_la_SOURCES = \ + Digest.cc \ + ExternalDataSource.cc \ + ExternalProgram.cc \ + MemUsage.cc \ + PathInfo.cc \ + Pathname.cc \ + Rep.cc \ + Y2SLog.cc \ + miniini.cc \ + stringutil.cc \ + y2log.cc + + +liby2util_la_LDFLAGS = -version-info 4:0:0 + +liby2util_la_LIBADD = #-lutil -lz $(OPENSSL_LIBS) -lxml2 Added: trunk/core/liby2util-r/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/Mak… ============================================================================== --- trunk/core/liby2util-r/src/include/Makefile.am (added) +++ trunk/core/liby2util-r/src/include/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1,34 @@ +# +# Makefile.am for liby2util/src/include +# + +SUBDIRS = y2util + +pkgincludedir = $(includedir) + +# these go to $(pkgincludedir) + +pkginclude_HEADERS = + +#<INSTALL-HEADER-TARGET> + +# Automatically inserted by insert_install_target +# DO NOT REMOVE THE TAGS! + +# Install header files only if different to version already installed - +# prevent unnecessary installations to keep make dependency changes +# and thus rebuilds for dependent packages as low as possible. + +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) + @list='$(pkginclude_HEADERS)'; \ + for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + if ! cmp -s $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; then \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ + fi \ + done + +#</INSTALL-HEADER-TARGET> Added: trunk/core/liby2util-r/src/include/y2util/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/src/include/y2u… ============================================================================== --- trunk/core/liby2util-r/src/include/y2util/Makefile.am (added) +++ trunk/core/liby2util-r/src/include/y2util/Makefile.am Tue Nov 13 10:45:16 2007 @@ -0,0 +1,46 @@ +# +# Makefile.am for liby2util/src/include/y2util +# + +pkgincludedir = $(includedir)/y2util + +# these go to $(pkgincludedir) + +pkginclude_HEADERS = \ + Digest.h \ + ExternalDataSource.h \ + ExternalProgram.h \ + MemUsage.h \ + PathInfo.h \ + Pathname.h \ + Rep.h \ + RepDef.h \ + Ustring.h \ + Y2SLog.h \ + miniini.h \ + stringutil.h \ + y2log.h + + +#<INSTALL-HEADER-TARGET> + +# Automatically inserted by insert_install_target +# DO NOT REMOVE THE TAGS! + +# Install header files only if different to version already installed - +# prevent unnecessary installations to keep make dependency changes +# and thus rebuilds for dependent packages as low as possible. + +install-pkgincludeHEADERS: $(pkginclude_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgincludedir) + @list='$(pkginclude_HEADERS)'; \ + for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + if ! cmp -s $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; then \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \ + fi \ + done + +#</INSTALL-HEADER-TARGET> -- 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] r41992 - /branches/tmp/sh/mod-ui/web-wt/src/Y2CCWeb.h
by visnov＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: visnov Date: Tue Nov 13 09:50:00 2007 New Revision: 41992 URL: http://svn.opensuse.org/viewcvs/yast?rev=41992&view=rev Log: fix UI initialization, it runs, baby\! Modified: branches/tmp/sh/mod-ui/web-wt/src/Y2CCWeb.h Modified: branches/tmp/sh/mod-ui/web-wt/src/Y2CCWeb.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/Y2CC… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/Y2CCWeb.h (original) +++ branches/tmp/sh/mod-ui/web-wt/src/Y2CCWeb.h Tue Nov 13 09:50:00 2007 @@ -50,10 +50,17 @@ */ Y2Component *create(const char * name) const { - if (!strcmp(name, "web") ) - return new YWebUIComponent(); - else - return 0; + if (!strcmp(name, "web") ) + { + Y2Component* ret = YUIComponent::uiComponent (); + if (!ret || ret->name () != name) + { + ret = new YWebUIComponent(); + } + return ret; + } + else + return 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] r41991 - in /branches/tmp/sh/mod-ui/ncurses/src/pkg: NCPackageSelector.cc NCPkgPopupDiskspace.cc
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 09:39:31 2007 New Revision: 41991 URL: http://svn.opensuse.org/viewcvs/yast?rev=41991&view=rev Log: activate/fix diskspace popup Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc Tue Nov 13 09:39:31 2007 @@ -266,10 +266,10 @@ #if 0 // the dependency popup depsPopup = new NCPkgPopupDeps( wpos( 3, 8 ), this ); - +#endif + // the disk space popup diskspacePopup = new NCPkgPopupDiskspace( wpos( (NCurses::lines() - 15)/2, NCurses::cols()/6 ), testMode ); -#endif } YStringTreeItem * NCPackageSelector::getDefaultRpmGroup() Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc Tue Nov 13 09:39:31 2007 @@ -99,14 +99,11 @@ // void NCPkgPopupDiskspace::createLayout( ) { - - YWidgetOpt opt; - // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); // addChild() is obsolete (handled by new libyui) - + head = new NCLabel( split, "", true, false ); // isHeading = true YTableHeader * tableHeader = new YTableHeader(); @@ -117,12 +114,12 @@ tableHeader->addColumn( "% ", YAlignBegin ); // add the partition table - //partitions = new NCTable( split, opt, header, false ); partitions = new NCTable( split, tableHeader ); + // add the ok button - opt.key_Fxx.setValue( 10 ); okButton = new NCPushButton( split, NCPkgNames::OKLabel() ); YStringWidgetID * okID = new YStringWidgetID( "ok" ); + okButton->setFunctionKey( 10 ); okButton->setId( okID ); } @@ -137,11 +134,9 @@ // void NCPkgPopupDiskspace::fillPartitionTable() { - //partitions->itemsCleared(); // clear table - partitions->deleteAllItems(); - - vector<string> pkgLine; - pkgLine.reserve(5); + partitions->deleteAllItems(); // clear table + + YTableItem * newItem; int i = 0; zypp::ZYpp::Ptr z = zypp::getZYpp(); @@ -164,21 +159,19 @@ if (it->readonly) continue; - pkgLine.clear(); - pkgLine.push_back (it->dir); - zypp::ByteCount pkg_used (it->pkg_size * 1024); - pkgLine.push_back (pkg_used.asString (8)); zypp::ByteCount pkg_available ((it->total_size - it->pkg_size) * 1024); - pkgLine.push_back (pkg_available.asString (8)); zypp::ByteCount total (it->total_size * 1024); - pkgLine.push_back (total.asString (8)); - pkgLine.push_back( usedPercent( it->pkg_size, it->total_size ) ); - // FIXME - //partitions->itemAdded( pkgLine, i ); + newItem = new YTableItem( it->dir, + pkg_used.asString (8), + pkg_available.asString (8), + total.asString (8), + usedPercent( it->pkg_size, it->total_size ) ); + + partitions->addItem( newItem ); i++; } @@ -413,20 +406,6 @@ popdownDialog(); } - -#if 0 -long NCPkgPopupDiskspace::nicesize(YUIDimension dim) -{ - long vdim; - if ( NCurses::lines() > 15 ) - vdim = 15; - else - vdim = NCurses::lines()-4; - - return ( dim == YD_HORIZ ? NCurses::cols()*2/3 : vdim ); -} -#endif - /////////////////////////////////////////////////////////////////// // // -- 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] r41990 - /branches/tmp/sh/mod-ui/web-wt/src/Makefile.am
by visnov＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: visnov Date: Tue Nov 13 09:14:17 2007 New Revision: 41990 URL: http://svn.opensuse.org/viewcvs/yast?rev=41990&view=rev Log: crap Modified: branches/tmp/sh/mod-ui/web-wt/src/Makefile.am Modified: branches/tmp/sh/mod-ui/web-wt/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/Make… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/web-wt/src/Makefile.am Tue Nov 13 09:14:17 2007 @@ -4,8 +4,6 @@ # SUBDIRS = pkg -WTLIBDIR=/usr/local/lib/ - AM_CXXFLAGS = -DY2LOG=\"ui-web\" \ -DWTLIBDIR=\"$(WTLIBDIR)\" -- 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] r41989 - /tags/branch-Linux-10_3-2_15_1/profile-manager/
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 23:14:56 2007 New Revision: 41989 URL: http://svn.opensuse.org/viewcvs/yast?rev=41989&view=rev Log: Created tag branch-Linux-10_3-2_15_1 for profile-manager Added: tags/branch-Linux-10_3-2_15_1/profile-manager/ - copied from r41988, branches/SuSE-Linux-10_3-Branch/profile-manager/ -- 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] r41988 - /tags/branch-Linux-10_3-2_15_1/
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 23:14:52 2007 New Revision: 41988 URL: http://svn.opensuse.org/viewcvs/yast?rev=41988&view=rev Log: Created tag branch-Linux-10_3-2_15_1 Added: tags/branch-Linux-10_3-2_15_1/ -- 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] r41987 - in /branches/SuSE-Linux-10_3-Branch/profile-manager: VERSION package/yast2-profile-manager.changes src/ProfileManager.ycp src/dialogs.ycp
by jsuchome＠svn.opensuse.org 12 Nov '07

12 Nov '07

Author: jsuchome Date: Mon Nov 12 23:14:48 2007 New Revision: 41987 URL: http://svn.opensuse.org/viewcvs/yast?rev=41987&view=rev Log: - read from correct config file (#337913) - do not write translated "file"/"service" into DB (#337913) - 2.15.1 Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profil… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/profile-manager/VERSION Mon Nov 12 23:14:48 2007 @@ -1 +1 @@ -2.15.0 +2.15.1 Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profil… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes (original) +++ branches/SuSE-Linux-10_3-Branch/profile-manager/package/yast2-profile-manager.changes Mon Nov 12 23:14:48 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 6 11:30:48 CET 2007 - jsuchome(a)suse.cz + +- read from correct config file (#337913) +- do not write translated "file"/"service" into DB (#337913) +- 2.15.1 + +------------------------------------------------------------------- Tue Jun 12 13:21:29 CEST 2007 - jsuchome(a)suse.cz - check if resource group is installed before selecting it (#143273) Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profil… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/profile-manager/src/ProfileManager.ycp Mon Nov 12 23:14:48 2007 @@ -511,7 +511,7 @@ */ global define boolean ReadConfigFile () ``{ - if (! FileUtils::Exists ("/etc/scpm.conf")) + if (! FileUtils::Exists ("/etc/sysconfig/scpm")) return false; scpm_conf = $[ Modified: branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/profil… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/profile-manager/src/dialogs.ycp Mon Nov 12 23:14:48 2007 @@ -163,11 +163,17 @@ // map for saving user_defined flags of each resource map user_defined = $[]; + // resource type (menu entry) + string filestring = _("File"); + // resource type (menu entry) + string servicestring= _("Service"); map type2string = $[ - // resource type (menu entry) - "file" : _("File"), - // resource type (menu entry) - "service" : _("Service"), + "file" : filestring, + "service" : servicestring + ]; + map string2type = $[ + filestring : "file", + servicestring : "service", ]; /** @@ -304,7 +310,8 @@ if (service != "" && !has_resource (service,"service")) { y2debug ("new service %1 for group %2", service, groupname); - items = add (items, `item(`id(service), "", service,"service")); + items = add (items, `item(`id(service), "", service, + type2string["service"]:"service")); user_defined [service] = true; UI::ChangeWidget(`id(`resources), `Items, items); } @@ -315,7 +322,8 @@ if (file != "" && !has_resource (file,"file")) { y2debug ("new file %1 for group %2", file, groupname); - items = add (items, `item(`id(file), "", file, "file")); + items = add (items, `item(`id(file), "", file, + type2string["file"]:"file")); user_defined [file] = true; UI::ChangeWidget(`id(`resources), `Items, items); } @@ -358,7 +366,7 @@ return $[ "active" : i[1]:"" == "X", "name" : i[2]:"", - "type" : i[3]:"", + "type" : string2type[i[3]:""]:(i[3]:""), "user_defined" : user_defined [ i[2]:""]:false ]; }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0