October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41662 - /tags/stable-2_16_1/online-update/
by jsuchome＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: jsuchome Date: Wed Oct 31 11:23:23 2007 New Revision: 41662 URL: http://svn.opensuse.org/viewcvs/yast?rev=41662&view=rev Log: Created tag stable-2_16_1 for online-update Added: tags/stable-2_16_1/online-update/ - copied from r41661, trunk/online-update/ -- 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] r41661 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/AutoOnlineUpdate.ycp
by jsuchome＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: jsuchome Date: Wed Oct 31 11:23:17 2007 New Revision: 41661 URL: http://svn.opensuse.org/viewcvs/yast?rev=41661&view=rev Log: - use --quiet option for zypper in cron job (#335305) - 2.16.1 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/AutoOnlineUpdate.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=41661&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Oct 31 11:23:17 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Oct 31 11:23:17 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 31 09:23:13 CET 2007 - jsuchome(a)suse.cz + +- use --quiet option for zypper in cron job (#335305) +- 2.16.1 + +------------------------------------------------------------------- Wed Oct 10 14:37:12 CEST 2007 - jsuchome(a)suse.cz - do not log progress on DoneDownload callback (#331271) Modified: trunk/online-update/src/AutoOnlineUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/AutoOnlineUpda… ============================================================================== --- trunk/online-update/src/AutoOnlineUpdate.ycp (original) +++ trunk/online-update/src/AutoOnlineUpdate.ycp Wed Oct 31 11:23:17 2007 @@ -192,12 +192,12 @@ if (timing == `weekly && day >= 0 && day <= 7) { - cronjob = sformat( "%1 %2 * * %3 root %4 up -y -t patch %5", + cronjob = sformat( "%1 %2 * * %3 root %4 up -y --quiet -t patch %5", minute, hour, day, updater, options); } else { - cronjob = sformat ("%1 %2 * * * root %3 up -y -t patch %4", + cronjob = sformat ("%1 %2 * * * root %3 up -y --quiet -t patch %4", minute, hour, updater, options); } // if ( autoget ) cronjob = cronjob + " -d"; -- 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] r41660 - /branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 11:20:34 2007 New Revision: 41660 URL: http://svn.opensuse.org/viewcvs/yast?rev=41660&view=rev Log: setSendKeyEvents( true ) for file/dirlist Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Wed Oct 31 11:20:34 2007 @@ -132,9 +132,6 @@ const string & headline, bool edit ) { - // FIXME - check all option settings - - YWidgetOpt opt; string startDir; startDir = checkIniDir( iniDir ); @@ -142,24 +139,12 @@ // the vertical split is the (only) child of the dialog NCLayoutBox * split = new NCLayoutBox( this, YD_VERT ); - // addChild() id obsolete (handled by new libyui) - - opt.notifyMode.setValue( false ); - - //the headline - //opt.isHeading.setValue( true ); - new NCLabel( split, headline, true, false ); // isHeading = true new NCSpacing( split, YD_VERT, false, 0.4 ); - opt.isHStretchable.setValue( true ); - NCFrame * frame = new NCFrame( split, "" ); - //NCLayoutBox * vSplit = new NCLayoutBox( frame, YD_VERT ); - opt.isEditable.setValue( false ); - opt.notifyMode.setValue( true ); // label for text field showing the selected dir dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false; dirName->setNotify( true ); @@ -168,8 +153,6 @@ YStringWidgetID * dirID = new YStringWidgetID( idDirName ); dirName->setId( dirID ); - //new NCSpacing( vSplit, YD_VERT, false, 0.6 ); - // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); @@ -188,12 +171,12 @@ dirHeader->addColumn( _("Directory name") ); // add the list of directories - opt.keyEvents.setValue( true ); dirList = new NCDirectoryTable( hSplit1, dirHeader, NCFileSelection::T_Overview, YCPString(startDir) ); - + dirList->setSendKeyEvents( true ); + YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); @@ -209,27 +192,24 @@ filter, YCPString(startDir) ); + fileList->setSendKeyEvents( true ); YStringWidgetID * dirFileID = new YStringWidgetID( idFileList ); fileList->setId( dirFileID ); - - opt.notifyMode.setValue( false ); - opt.keyEvents.setValue( false ); - NCLayoutBox * hSplit2 = new NCLayoutBox( split, YD_HORIZ ); + // opt.isEditable.setValue( edit ); + // the NCInputField doesn't support mode editable/not editable any longer + // FIXME or let it like it is ???? + // add the text entry for the file name - opt.isEditable.setValue( edit ); // FIXME fileName = new NCInputField( hSplit2, // label for text field showing the filename _( "&File name:" ), - false, + false, // passWordMode = false 100, - 50 ); // passWordMode = false + 50 ); fileName->setValue( iniFileName ); - fileName->setInputMaxLength( 100 ); - // FIXME - // fileName->setMaxFld( 50); // label for text field showing the filter (e.g. *.bak) NCComboBox * extension = new NCComboBox( hSplit2, _( "Filter:" ), edit ); // editable as set in edit @@ -237,32 +217,27 @@ extension->addItem( filter, true ); // selected - //split->addChild( new NCSpacing( split, opt, 0.8, false, true ) ); new NCSpacing( split, YD_VERT, false, 0.8 ); // HBox for the buttons NCLayoutBox * hSplit3 = new NCLayoutBox( split, YD_HORIZ ); - opt.isHStretchable.setValue( true ); - //hSplit3->addChild( new NCSpacing( hSplit3, opt, 0.2, true, false ) ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - opt.key_Fxx.setValue( 10 ); // see okButton - // add the OK button okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); + okButton->setStretchable( YD_HORIZ, true ); YStringWidgetID * okID = new YStringWidgetID( idOk ); okButton->setId( okID ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); - opt.key_Fxx.setValue( 9 ); // see cancelButton - // add the Cancel button cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); + cancelButton->setStretchable( YD_HORIZ, true ); YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); cancelButton->setId( cancelID ); -- 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] r41659 - /branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc
by gs＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: gs Date: Wed Oct 31 10:41:11 2007 New Revision: 41659 URL: http://svn.opensuse.org/viewcvs/yast?rev=41659&view=rev Log: check keepSorting() correctly in getCurrentItem() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Wed Oct 31 10:41:11 2007 @@ -177,7 +177,6 @@ } _header[ col ] = NCstring( s ); - //YTable::setAlignment( col, al ); } /////////////////////////////////////////////////////////////////// @@ -255,7 +254,7 @@ { if ( !myPad()->Lines() ) return -1; - return ( ! keepSorting() ) ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () + return keepSorting() ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () : myPad()->CurPos().L; } -- 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] r41658 - in /trunk/python-bindings/src: Makefile.am YCP.cc YCPDeclarations.cc YCPDeclarations.h YCPTypes/Code.cc YCPTypes/Term.cc YCPTypes/YCPTypesInternal.cc YPython.cc YPythonNamespace.cc
by juhliarik＠svn.opensuse.org 31 Oct '07

31 Oct '07

Author: juhliarik Date: Wed Oct 31 10:12:50 2007 New Revision: 41658 URL: http://svn.opensuse.org/viewcvs/yast?rev=41658&view=rev Log: -deleted temporary part of code (testing additional parts) Modified: trunk/python-bindings/src/Makefile.am trunk/python-bindings/src/YCP.cc trunk/python-bindings/src/YCPDeclarations.cc trunk/python-bindings/src/YCPDeclarations.h trunk/python-bindings/src/YCPTypes/Code.cc trunk/python-bindings/src/YCPTypes/Term.cc trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPythonNamespace.cc Modified: trunk/python-bindings/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/Makefile.am?… ============================================================================== --- trunk/python-bindings/src/Makefile.am (original) +++ trunk/python-bindings/src/Makefile.am Wed Oct 31 10:12:50 2007 @@ -30,9 +30,7 @@ libYCP_la_SOURCES = \ $(liby2lang_python_la_SOURCES) \ YCP.cc \ - PythonLogger.cc PythonLogger.h \ - YPythonNamespace.cc YPythonNamespace.h \ - YCPDeclarations.cc YCPDeclarations. + PythonLogger.cc PythonLogger.h @@ -54,6 +52,8 @@ -lycp -ly2 \ -Xlinker --no-whole-archive \ -ly2util \ + -ly2 \ + -lYCPDeclarations \ -version-info 2:0 libYCP_la_LIBADD = libYCPTypes.la #libYCPDeclarations.la Modified: trunk/python-bindings/src/YCP.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCP.cc?rev=4… ============================================================================== --- trunk/python-bindings/src/YCP.cc (original) +++ trunk/python-bindings/src/YCP.cc Wed Oct 31 10:12:50 2007 @@ -43,8 +43,6 @@ PyObject * SCR_Run (const char *scr_command, PyObject *args); -PyObject * Py_ycp_code(PyObject *args); - void Py_y2logger(PyObject *args); void init_wfm (); @@ -129,12 +127,14 @@ return Py_None; } +/* static PyObject * ycp_code (PyObject *self, PyObject *args) { Py_ycp_code(args); return Py_None; } +*/ /** * This is needed for importing new module from ycp. @@ -154,7 +154,6 @@ {"SCR_Execute", ycp_scr_execute, METH_VARARGS, "SCR Execute function"}, {"SCR_Dir", ycp_scr_dir, METH_VARARGS, "SCR Dir function"}, {"y2logger", ycp_y2logger, METH_VARARGS, "Logging error, debug messages and milestones in python"}, - {"ycp_code", ycp_code, METH_VARARGS, "Convert Python function call to YCP Code"}, {NULL, NULL, 0, NULL} /* Sentinel */ }; @@ -349,40 +348,6 @@ } -PyObject * Py_ycp_code(PyObject *args) { - - Parser *parser; - PyObject *temp; - string command; - YCodePtr c = 0; - - temp = PyTuple_GetItem(args, 0); - - if (PyString_Check(temp)) - command = PyString_AsString(temp); - else - command = ""; - cout << command << endl; - parser = new Parser(command.c_str()); - - //parser->setInput(command.c_str()); - //parser->setBuffered(); - c = parser->parse(); - - if (c) - c->evaluate(); - else - cout << "eee c nejde!" << endl; - - cout << c->toString() << endl; - - delete(parser); - - return Py_None; - -} - - PyObject * Import_YCPNameSpace (PyObject *args) { PyObject* pResult = PyBool_FromLong(0); Modified: trunk/python-bindings/src/YCPDeclarations.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.cc (original) +++ trunk/python-bindings/src/YCPDeclarations.cc Wed Oct 31 10:12:50 2007 @@ -2,10 +2,10 @@ #include <iostream> using std::string; using std::vector; -//#define DBG(str) \ +#define DBG(str) \ std::cerr << __FILE__ << ": " << __LINE__ << ": " << str << std::endl; \ std::cerr.flush() -#define DBG(str) +//#define DBG(str) /********** STATIC MEMBERS **********/ @@ -172,8 +172,9 @@ YCPDeclarations::~YCPDeclarations() { + DBG("YCPDeclarations - destructor"); - + int cache_len = _cache.size(); for (int i=0; i < cache_len; i++){ delete _cache[i]; @@ -181,6 +182,8 @@ if (_py_self != NULL) Py_DECREF(_py_self); + + //_instance = std::auto_ptr<YCPDeclarations>(NULL); } Modified: trunk/python-bindings/src/YCPDeclarations.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPDeclarati… ============================================================================== --- trunk/python-bindings/src/YCPDeclarations.h (original) +++ trunk/python-bindings/src/YCPDeclarations.h Wed Oct 31 10:12:50 2007 @@ -49,13 +49,13 @@ std::vector<cache_function_t *> _cache; - /** * Private construct. * Call YCPDeclarations::instance() to get pointer to YCPDeclarations * object. */ YCPDeclarations(); + /** * Return item from function map which has key key. Modified: trunk/python-bindings/src/YCPTypes/Code.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Cod… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Code.cc (original) +++ trunk/python-bindings/src/YCPTypes/Code.cc Wed Oct 31 10:12:50 2007 @@ -23,7 +23,7 @@ if (self != NULL){ self->value = Py_None; if (self->value == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } Modified: trunk/python-bindings/src/YCPTypes/Term.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/Ter… ============================================================================== --- trunk/python-bindings/src/YCPTypes/Term.cc (original) +++ trunk/python-bindings/src/YCPTypes/Term.cc Wed Oct 31 10:12:50 2007 @@ -23,12 +23,12 @@ if (self != NULL){ self->name = PyString_FromString(""); if (self->name == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } self->value = PyTuple_New(0); if (self->value == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } Modified: trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YCPTypes/YCP… ============================================================================== --- trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc (original) +++ trunk/python-bindings/src/YCPTypes/YCPTypesInternal.cc Wed Oct 31 10:12:50 2007 @@ -16,7 +16,7 @@ if (self != NULL){ self->value = PyString_FromString(""); if (self->value == NULL){ - Py_DECREF(self); + Py_XDECREF(self); return NULL; } @@ -65,7 +65,7 @@ Py_INCREF(value); if (PyTuple_SetItem(args, 0, value) != 0){ Py_XDECREF(args); - Py_DECREF(value); + Py_XDECREF(value); } // create new Path object Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Wed Oct 31 10:12:50 2007 @@ -129,29 +129,20 @@ module_name = module.substr(found+1); //delete last 3 chars from module name ".py" module_name.erase(module_name.size()-3); //delete ".py" - //initialize python and set the path where are python modules - cout << "Searching path for modules: " << Py_GetPath()<< endl; + //initialize python and set the path where are python modules if (!Py_IsInitialized()) { - cout <<"path :" << path << endl; - setenv("PYTHONPATH", path.c_str(), 1); - + setenv("PYTHONPATH", path.c_str(), 1); Py_Initialize(); YPython::_pMainDicts = PyDict_New(); } - setenv("PYTHONPATH", path.c_str(), 1); - cout <<"path :" << path << endl; if (!YPython::_pMainDicts) YPython::_pMainDicts = PyDict_New(); //create python string for name of module pModuleName = PyString_FromString(module_name.c_str()); //check if dictionary contain "dictionary" for module if ( PyDict_Contains(YPython::_pMainDicts, pModuleName) == 0) { - cout <<"loadModule name: " << module_name << endl; - //char * new_path = (char *) path.c_str(); - //PySys_SetPath(new_path); - cout << "Searching path for modules after init: " << Py_GetPath()<< endl; pMain = PyImport_ImportModule(module_name.c_str()); if (pMain == NULL){ y2error("Can't import module %s", module_name.c_str()); @@ -628,10 +619,9 @@ char *fun_name = PyString_AsString(((PyCodeObject *) fun_code)->co_name); string file_path = PyString_AsString(((PyCodeObject *) fun_code)->co_filename); - //Y2Namespace* name_space = new Y2Namespace(); - printf ("meno funckie %s\n", fun_name); - printf ("meno suboru %s\n", file_path.c_str()); + //printf ("meno funckie %s\n", fun_name); + //printf ("meno suboru %s\n", file_path.c_str()); //found last "/" in path size_t found = file_path.find_last_of("/"); @@ -650,16 +640,17 @@ y2error("Finding file where is function %s failed", fun_name); return YCPNull(); } + + //found last "/" in path + found = file_path.find_last_of("/"); + string path = file_path.substr(0,found+1); + setenv("PYTHONPATH", path.c_str(), 1); YPython::loadModule (file_path); - - //found last "/" in path - found = file_path.find_last_of("/"); //extract module name from path - module_name = file_path.substr(found+1); //delete last 3 chars from module name ".py" @@ -668,7 +659,6 @@ //found last "/" in path Y2Namespace *ns = new YPythonNamespace (module_name); - if (ns) { TableEntry *sym_te = ns->table ()->find (fun_name); if (sym_te == NULL) { @@ -676,7 +666,7 @@ return YCPNull(); } SymbolEntryPtr sym_entry = sym_te->sentry(); - cout << "entry" << sym_entry->toString()<< endl; + //cout << "entry" << sym_entry->toString()<< endl; return YCPReference(sym_entry); } else { Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Wed Oct 31 10:12:50 2007 @@ -155,6 +155,7 @@ //Declarations (using YPCDelcarations python module) YCPDeclarations *decl = YCPDeclarations::instance(); + FunctionTypePtr sym_tp; std::vector<constTypePtr> list_of_types; int tmp; @@ -171,7 +172,6 @@ return; } - //keys from dictionary fun_names = PyDict_Keys(pMainDict); @@ -191,7 +191,8 @@ fun_code = PyFunction_GetCode(pFunc); num = ((PyCodeObject *) fun_code)->co_argcount; - if (decl->exists((PyFunctionObject *)pFunc) + + if (decl->exists((PyFunctionObject *)pFunc) && decl->numParams((PyFunctionObject *)pFunc) == num){ sym_tp = new FunctionType(decl->returnType((PyFunctionObject *)pFunc)); @@ -222,13 +223,16 @@ // enter it to the symbol table enterSymbol (fun_se, 0); } - } // end of for (int i = 0; i < num_fun_names; i++) + } // end of for (int i = 0; i < num_fun_names; i++) + y2milestone ("YPythonNamespace finish"); } YPythonNamespace::~YPythonNamespace () { + + } const string YPythonNamespace::filename () const -- 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] r41657 - /tags/branch-SLE-10-SP1-2_13_26/add-on-creator/
by jsuchome＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: jsuchome Date: Tue Oct 30 22:26:16 2007 New Revision: 41657 URL: http://svn.opensuse.org/viewcvs/yast?rev=41657&view=rev Log: Created tag branch-SLE-10-SP1-2_13_26 for add-on-creator Added: tags/branch-SLE-10-SP1-2_13_26/add-on-creator/ - copied from r41656, branches/SuSE-SLE-10-SP1-Branch/add-on-creator/ -- 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] r41656 - in /branches/SuSE-SLE-10-SP1-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: jsuchome Date: Tue Oct 30 22:22:28 2007 New Revision: 41656 URL: http://svn.opensuse.org/viewcvs/yast?rev=41656&view=rev Log: - create patterns with correct key ordering (#328816) - after pattern import, show also keys without value (#329738) - 2.13.26 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Tue Oct 30 22:22:28 2007 @@ -1 +1 @@ -2.13.25 +2.13.26 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Tue Oct 30 22:22:28 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 30 22:16:18 CET 2007 - jsuchome(a)suse.cz + +- create patterns with correct key ordering (#328816) +- after pattern import, show also keys without value (#329738) +- 2.13.26 + +------------------------------------------------------------------- Wed Sep 5 12:53:26 CEST 2007 - jsuchome(a)suse.cz - enable deleting of pattern keys (#297195) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Tue Oct 30 22:22:28 2007 @@ -259,7 +259,7 @@ // desctiption of pattern keys -global map pattern_descr = $[ +global map<string,map> pattern_descr = $[ "name" : $[ "internal" : true, ], @@ -812,6 +812,15 @@ else ret[key] = val; }); + foreach (string key, map descr, pattern_descr, { + if (!haskey (ret, key) && !descr["internal"]:false) + { + y2debug ("adding empty key '%1'...", key); + // do not add default values - maybe imported pattern + // ignored them intentionally + ret[key] = ""; + } + }); return ret; } @@ -1412,7 +1421,10 @@ if (filename == "") return; names = add (names, filename); - string file = ""; + string file = sformat ("=Ver: %1\n\n=Pat: %2\n", + pattern["Ver"]:pattern_descr["Ver","defval"]:"", + pattern["Pat"]:""); + pattern = remove (remove (pattern, "Ver"), "Pat"); foreach (string key, any val, (map<string,any>) pattern, { map descr = pattern_descr[key]:$[]; // substring (key,0,3) is because of Des.lang, Sum.lang and Cat.lang -- 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] r41655 - in /trunk/gtk: ChangeLog src/YGDialog.cc src/ygtkmenubutton.c
by rpmcruz＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: rpmcruz Date: Tue Oct 30 18:58:45 2007 New Revision: 41655 URL: http://svn.opensuse.org/viewcvs/yast?rev=41655&view=rev Log: * src/ygtkmenubutton.c: simplified menu pos code. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc trunk/gtk/src/ygtkmenubutton.c Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41655&r1=41654… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Tue Oct 30 18:58:45 2007 @@ -1,3 +1,7 @@ +2007-10-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkmenubutton.c: simplified menu pos code. + 2007-10-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGProgressBar.cc: improved look of the multi-progress-bar. Made Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=41655&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Tue Oct 30 18:58:45 2007 @@ -191,11 +191,11 @@ if (parent) { // if there is a parent, this would be a dialog - gtk_window_set_transient_for (window, parent); gtk_window_set_title (window, ""); - gtk_window_set_modal (window, TRUE); + gtk_window_set_transient_for (window, parent); gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); + //gtk_window_set_focus_on_map (window, FALSE); } else { gtk_window_set_title (window, "YaST"); Modified: trunk/gtk/src/ygtkmenubutton.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkmenubutton.c?rev=416… ============================================================================== --- trunk/gtk/src/ygtkmenubutton.c (original) +++ trunk/gtk/src/ygtkmenubutton.c Tue Oct 30 18:58:45 2007 @@ -141,46 +141,11 @@ static void ygtk_menu_button_get_menu_pos (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer pointer) { - // Based on code from GtkComboBox GtkWidget *widget = (GtkWidget*) pointer; - gint sx, sy; - GtkRequisition req; - - gdk_window_get_origin (widget->window, &sx, &sy); - - if (GTK_WIDGET_NO_WINDOW (widget)) { - sx += widget->allocation.x; - sy += widget->allocation.y; - } - - gtk_widget_size_request (GTK_WIDGET (menu), &req); - - if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) - *x = sx; - else - *x = sx + widget->allocation.width - req.width; - *y = sy; - - GdkRectangle monitor; - GdkScreen *screen = gtk_widget_get_screen (widget); - int monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - if (*x < monitor.x) - *x = monitor.x; - else if (*x + req.width > monitor.x + monitor.width) - *x = monitor.x + monitor.width - req.width; - - if (monitor.y + monitor.height - *y - widget->allocation.height >= req.height) - *y += widget->allocation.height; - else if (*y - monitor.y >= req.height) - *y -= req.height; - else if (monitor.y + monitor.height - *y - widget->allocation.height > *y - monitor.y) - *y += widget->allocation.height; - else - *y -= req.height; - - *push_in = FALSE; + gdk_window_get_origin (widget->window, x, y); + *x += widget->allocation.x; + *y += widget->allocation.y + widget->allocation.height; + *push_in = TRUE; } static void ygtk_menu_button_show_popup (YGtkMenuButton *button) -- 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] r41654 - /tags/stable-2_16_2/installation/
by locilka＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: locilka Date: Tue Oct 30 17:42:20 2007 New Revision: 41654 URL: http://svn.opensuse.org/viewcvs/yast?rev=41654&view=rev Log: Created tag stable-2_16_2 for installation Added: tags/stable-2_16_2/installation/ - copied from r41653, trunk/installation/ -- 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] r41653 - /tags/stable-2_16_3/yast2/
by locilka＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: locilka Date: Tue Oct 30 17:39:56 2007 New Revision: 41653 URL: http://svn.opensuse.org/viewcvs/yast?rev=41653&view=rev Log: Created tag stable-2_16_3 for yast2 Added: tags/stable-2_16_3/yast2/ - copied from r41652, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0