January 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r44069 - in /trunk: core/ core/libyui/src/ core/package/ ncurses/ ncurses/package/ ncurses/src/ qt/ qt/src/
by sh-sh-sh＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: sh-sh-sh Date: Thu Jan 31 15:30:44 2008 New Revision: 44069 URL: http://svn.opensuse.org/viewcvs/yast?rev=44069&view=rev Log: Simplified dialog handling Modified: trunk/core/VERSION trunk/core/libyui/src/ChangeLog trunk/core/libyui/src/YCPErrorDialog.cc trunk/core/libyui/src/YDialog.cc trunk/core/libyui/src/YDialog.h trunk/core/libyui/src/YUI.h trunk/core/libyui/src/YUIException.h trunk/core/libyui/src/YUI_builtins.cc trunk/core/package/yast2-core.changes trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCDialog.cc trunk/ncurses/src/NCDialog.h trunk/ncurses/src/YNCursesUI.cc trunk/ncurses/src/YNCursesUI.h trunk/qt/VERSION.cmake trunk/qt/src/YQDialog.cc trunk/qt/src/YQDialog.h trunk/qt/src/YQUI_core.cc trunk/qt/yast2-qt.spec.in Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=44069&r1=44068&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Thu Jan 31 15:30:44 2008 @@ -1 +1 @@ -2.16.24 +2.16.25 Modified: trunk/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ChangeLog?rev=44… ============================================================================== --- trunk/core/libyui/src/ChangeLog (original) +++ trunk/core/libyui/src/ChangeLog Thu Jan 31 15:30:44 2008 @@ -484,3 +484,13 @@ * Moved YCP part out of YEvent to new class YCPEvent * YUI::runPkgSelection() now returns YEvent * and is pure virtual + + +2008-01-31 sh(a)suse.de + +* Moved dialog handling from YUI to YDialog: + - removed YUI::showDialog() + - removed YUI::closeDialog() + - Now using YDialog::open() and YDialog::destroy() + - Derived classes now have to implement YDialog::openInternal() + and YDialog::activate() Modified: trunk/core/libyui/src/YCPErrorDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPErrorDialog.c… ============================================================================== --- trunk/core/libyui/src/YCPErrorDialog.cc (original) +++ trunk/core/libyui/src/YCPErrorDialog.cc Thu Jan 31 15:30:44 2008 @@ -51,20 +51,19 @@ fac->createHStretch( buttonBox ); YPushButton * closeButton = fac->createPushButton( buttonBox, "&Close" ); closeButton->setId( new YCPValueWidgetID( YCPSymbol( "cancel" ) ) ); - - dialog->setInitialSize(); - dialog->checkShortcuts(); - YUI::ui()->showDialog( dialog ); + dialog->open(); YCPValue input = YUI::ui()->waitForUserInput(); yuiMilestone() << "Input: " << input << endl; - YUI::ui()->closeDialog( YDialog::currentDialog() ); - YDialog::deleteTopmostDialog(); + dialog->destroy(); } catch ( YUIException & ex ) { YUI_CAUGHT( exception ); + + // No other action. If opening this error dialog fails, the user will + // just have to live with the error being reported in the log file only. } catch ( ... ) { Modified: trunk/core/libyui/src/YDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YDialog.cc?rev=4… ============================================================================== --- trunk/core/libyui/src/YDialog.cc (original) +++ trunk/core/libyui/src/YDialog.cc Thu Jan 31 15:30:44 2008 @@ -40,12 +40,14 @@ , colorMode( colorMode ) , shortcutCheckPostponed( false ) , defaultButton( 0 ) + , isOpen( false ) {} YDialogType dialogType; YDialogColorMode colorMode; bool shortcutCheckPostponed; YPushButton * defaultButton; + bool isOpen; }; @@ -55,7 +57,7 @@ , priv( new YDialogPrivate( dialogType, colorMode ) ) { YUI_CHECK_NEW( priv ); - + _dialogStack.push( this ); #if VERBOSE_DIALOGS @@ -69,6 +71,57 @@ #if VERBOSE_DIALOGS yuiDebug() << "Destroying " << this << endl; #endif + + if ( ! _dialogStack.empty() && _dialogStack.top() == this ) + { + _dialogStack.pop(); + + if ( ! _dialogStack.empty() ) + _dialogStack.top()->activate(); + } + else + yuiError() << "Not top of dialog stack: " << this << endl; +} + + +void +YDialog::open() +{ + if ( priv->isOpen ) + return; + + checkShortcuts(); + setInitialSize(); + openInternal(); // Make sure this is only called once! + + priv->isOpen = true; +} + + +bool +YDialog::isOpen() const +{ + return priv->isOpen; +} + + +bool +YDialog::destroy( bool doThrow ) +{ + YUI_CHECK_WIDGET( this ); + + if ( _dialogStack.empty() || + _dialogStack.top() != this ) + { + if ( doThrow ) + YUI_THROW( YUIDialogStackingOrderException() ); + + return false; + } + + delete this; + + return true; } @@ -145,12 +198,21 @@ #if VERBOSE_DIALOGS yuiDebug() << "Setting initial size for " << this << endl; #endif - + // Trigger geometry management setSize( preferredWidth(), preferredHeight() ); } +void +YDialog::recalcLayout() +{ + yuiDebug() << "Recalculating layout for " << this << endl; + + setSize( preferredWidth(), preferredHeight() ); +} + + YDialog * @@ -178,7 +240,6 @@ else { delete _dialogStack.top(); - _dialogStack.pop(); } return ! _dialogStack.empty(); @@ -188,8 +249,31 @@ void YDialog::deleteAllDialogs() { - while ( deleteTopmostDialog( false ) ) - {} + while ( ! _dialogStack.empty() ) + { + delete _dialogStack.top(); + } +} + + +void +YDialog::deleteTo( YDialog * targetDialog ) +{ + YUI_CHECK_WIDGET( targetDialog ); + + while ( ! _dialogStack.empty() ) + { + YDialog * dialog = _dialogStack.top(); + + delete dialog; + + if ( dialog == targetDialog ) + return; + } + + // If we ever get here, targetDialog was nowhere in the dialog stack. + + YUI_THROW( YUIDialogStackingOrderException() ); } Modified: trunk/core/libyui/src/YDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YDialog.h?rev=44… ============================================================================== --- trunk/core/libyui/src/YDialog.h (original) +++ trunk/core/libyui/src/YDialog.h Thu Jan 31 15:30:44 2008 @@ -48,7 +48,8 @@ /** * Destructor. - * Don't delete a dialog directly, use YDialog::deleteTopmostDialog(). + * Don't delete a dialog directly, use YDialog::deleteTopmostDialog() + * or YDialog::destroy(). **/ virtual ~YDialog(); @@ -60,10 +61,47 @@ virtual const char * widgetClass() const { return "YDialog"; } /** + * Open a newly created dialog: Finalize it and make it visible + * on the screen. + * + * Applications should call this once after all children are created. + * If the application doesn't do this, it will be done automatically upon + * the next call of YDialog::waitForEvent() (or related). This is OK if + * YDialog::waitForEvent() is called immediately after creating the dialog + * anyway. If it is not, the application might appear sluggish to the user. + * + * Derived classes are free to reimplement this, but they should call this + * base class method in the new implementation. + **/ + void open(); + + /** + * Return 'true' if open() has already been called for this dialog. + **/ + bool isOpen() const; + + /** + * Close and delete this dialog (and all its children) if it is the topmost + * dialog. If this is not the topmost dialog, this will throw an exception + * if 'doThrow' is true (default). + * + * Remember that all pointers to the dialog and its children will be + * invalid after this operation. + * + * This is intentionally not named close() since close() would not imply + * that the dialog and its children are deleted. + * + * Returns 'true' upon success, 'false' upon failure. + **/ + bool destroy( bool doThrow = true ); + + /** * Delete the topmost dialog. * * Will throw a YUINoDialogException if there is no dialog and 'doThrow' is - * 'true'. + * 'true'. + * + * This is equivalent to YDialog::currentDialog()->destroy(). * * Returns 'true' if there is another open dialog after deleting, * 'false' if there is none. @@ -76,6 +114,11 @@ static void deleteAllDialogs(); /** + * Delete all dialogs from the topmost to the one specified. + **/ + static void deleteTo( YDialog * dialog ); + + /** * Returns the number of currently open dialogs (from 1 on), i.e., the * depth of the dialog stack. **/ @@ -103,6 +146,20 @@ void setInitialSize(); /** + * Recalculate the layout of the dialog and of all its children after + * children have been added or removed or if any of them changed its + * preferred width of height. + * + * This is a very expensive operation. Call it only when really necessary. + * YDialog::open() includes a call to YDialog::setInitialSize() which does + * the same. + * + * The basic idea behind this function is to call it when the dialog + * changed after it (and its children hierarchy) was initially created. + **/ + void recalcLayout(); + + /** * Return this dialog's type (YMainDialog / YPopupDialog). **/ YDialogType dialogType() const; @@ -153,9 +210,29 @@ **/ virtual void setDefaultButton( YPushButton * defaultButton ); + /** + * Activate this dialog: Make sure that it is shown as the topmost dialog + * of this application and that it can receive input. + * + * Derived classes are required to implement this. + **/ + virtual void activate() = 0; + protected: + /** + * Internal open() method. This is called (exactly once during the life + * time of the dialog) in open(). + * + * Derived classes are required to implement this to do whatever is + * necessary to make this dialog visible on the screen. + **/ + virtual void openInternal() = 0; + + /** + * Stack holding all currently existing dialogs. + **/ static std::stack<YDialog *> _dialogStack; private: Modified: trunk/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI.h?rev=44069&… ============================================================================== --- trunk/core/libyui/src/YUI.h (original) +++ trunk/core/libyui/src/YUI.h Thu Jan 31 15:30:44 2008 @@ -427,22 +427,6 @@ virtual YEvent * pollInput() = 0; -public: - /** - * Show and activate a previously created dialog. - * This default implementation does nothing. - **/ - virtual void showDialog( YDialog *dialog ); - - /** - * Decativate and close a previously created dialog. - * This default implementation does nothing. - * - * Don't delete the dialog. This will be done at some other place. - **/ - virtual void closeDialog( YDialog *dialog ); - - protected: Modified: trunk/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUIException.h?r… ============================================================================== --- trunk/core/libyui/src/YUIException.h (original) +++ trunk/core/libyui/src/YUIException.h Thu Jan 31 15:30:44 2008 @@ -457,6 +457,18 @@ }; +class YUIDialogStackingOrderException: public YUIException +{ +public: + YUIDialogStackingOrderException() + : YUIException( "Dialog stacking order violated" ) + {} + + virtual ~YUIDialogStackingOrderException() throw() + {} +}; + + class YUISyntaxErrorException: public YUIException { public: Modified: trunk/core/libyui/src/YUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_builtins.cc?… ============================================================================== --- trunk/core/libyui/src/YUI_builtins.cc (original) +++ trunk/core/libyui/src/YUI_builtins.cc Thu Jan 31 15:30:44 2008 @@ -712,6 +712,8 @@ YDialog::currentDialog()->dumpWidgetTree(); #endif + YDialog::currentDialog()->activate(); + delete widgetEvent; return 0; } @@ -791,10 +793,7 @@ YUI_CHECK_NEW( dialog ); YCPDialogParser::parseWidgetTreeTerm( dialog, dialogTerm ); - - dialog->setInitialSize(); - dialog->checkShortcuts(); - showDialog( dialog ); + dialog->open(); } catch ( YUIException & exception ) { @@ -830,28 +829,13 @@ YCPValue YUI::evaluateCloseDialog() { blockEvents(); // We don't want self-generated events from UI builtins. - - closeDialog( YDialog::currentDialog() ); YDialog::deleteTopmostDialog(); - unblockEvents(); return YCPBoolean( true ); } -void YUI::showDialog( YDialog * ) -{ - // dummy default implementation -} - - -void YUI::closeDialog( YDialog * ) -{ - // dummy default implementation -} - - /** * @builtin ChangeWidget Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Thu Jan 31 15:30:44 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 31 15:25:52 CET 2008 - sh(a)suse.de + +- Simplified and unified internal UI dialog handling +- V 2.16.25 + +------------------------------------------------------------------- Tue Jan 29 20:02:26 CET 2008 - sh(a)suse.de - YCP-less event handling in libyui core Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=44069&r1=440… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Thu Jan 31 15:30:44 2008 @@ -1 +1 @@ -2.16.12 +2.16.13 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Thu Jan 31 15:30:44 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 31 15:27:49 CET 2008 - sh(a)suse.de + +- Simplified dialog handling +- V 2.16.13 + +------------------------------------------------------------------- Thu Jan 31 14:22:36 CET 2008 - kmachalkova(a)suse.cz - Align numbers in IntFields to the right margin of the label, not Modified: trunk/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.cc?rev=4406… ============================================================================== --- trunk/ncurses/src/NCDialog.cc (original) +++ trunk/ncurses/src/NCDialog.cc Thu Jan 31 15:30:44 2008 @@ -247,6 +247,13 @@ } } + +void NCDialog::openInternal() +{ + showDialog(); +} + + /////////////////////////////////////////////////////////////////// // // @@ -324,6 +331,20 @@ } } + +/** + * Implementation of YDialog::activate(). + * + * This is called e.g. for the next-lower dialog in the dialog stack when the + * topmost dialog is destroyed: That next-lower dialog is now the active + * dialog. + **/ +void NCDialog::activate() +{ + activate( true ); // Forward to NCurses-specific activate() +} + + /////////////////////////////////////////////////////////////////// // // Modified: trunk/ncurses/src/NCDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCDialog.h?rev=44069… ============================================================================== --- trunk/ncurses/src/NCDialog.h (original) +++ trunk/ncurses/src/NCDialog.h Thu Jan 31 15:30:44 2008 @@ -119,6 +119,20 @@ virtual void startMultipleChanges(); virtual void doneMultipleChanges(); + + /** + * Internal open() method: Initialize what is left over to initialize after + * all dialog children have been created. + * YDialog::setInitialSize() is already called before this in + * YDailog::open(), so don't call it here again (very expensive!). + * + * This function is called (exactly once during the life time of the + * dialog) in YDialog::open(). + * + * Implemented from YDialog. + **/ + virtual void openInternal(); + public: @@ -148,6 +162,14 @@ **/ virtual void setSize( int newWidth, int newHeight ); + /** + * Activate this dialog: Make sure that it is shown as the topmost dialog + * of this application and that it can receive input. + * + * Implemented from YDialog. + **/ + virtual void activate(); + protected: enum NCDopts { Modified: trunk/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.cc?rev=44… ============================================================================== --- trunk/ncurses/src/YNCursesUI.cc (original) +++ trunk/ncurses/src/YNCursesUI.cc Thu Jan 31 15:30:44 2008 @@ -307,28 +307,6 @@ return yevent; } -/////////////////////////////////////////////////////////////////// -// -// Dialog and widgets -// -/////////////////////////////////////////////////////////////////// - -void YNCursesUI::showDialog( YDialog * dialog ) { - NCDialog * dlg = dynamic_cast<NCDialog *>( dialog ); - UIDBG << dlg << endl; - if ( dlg ) - { - dlg->showDialog(); - //dlg->dumpWidgetTree(); - } -} - -void YNCursesUI::closeDialog( YDialog * dialog ) { - NCDialog * dlg = dynamic_cast<NCDialog *>( dialog ); - UIDBG << dlg << endl; - if ( dlg ) - dlg->closeDialog(); -} #define ONCREATE WIDDBG << endl //#define ONCREATE Modified: trunk/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.h?rev=440… ============================================================================== --- trunk/ncurses/src/YNCursesUI.h (original) +++ trunk/ncurses/src/YNCursesUI.h Thu Jan 31 15:30:44 2008 @@ -122,16 +122,6 @@ virtual YEvent * pollInput(); /** - * Inherited from YUIInterpreter. Shows and activates a dialog - */ - virtual void showDialog( YDialog * dialog ); - - /** - * Inherited from YUIInterpreter. Decativates and closes a dialog - */ - virtual void closeDialog( YDialog * dialog ); - - /** * Fills the PackageSelector widget and runs package selection. */ virtual YEvent * runPkgSelection( YWidget * packageSelector ); Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=44069&r1=44… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Thu Jan 31 15:30:44 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "19") +SET(VERSION_PATCH "20") Modified: trunk/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.cc?rev=44069&r1=… ============================================================================== --- trunk/qt/src/YQDialog.cc (original) +++ trunk/qt/src/YQDialog.cc Thu Jan 31 15:30:44 2008 @@ -118,6 +118,24 @@ } +void +YQDialog::openInternal() +{ + ensureOnlyOneDefaultButton(); + QWidget::show(); + QWidget::raise(); // FIXME: is this really necessary? + QWidget::update(); +} + + +void +YQDialog::activate() +{ + QWidget::raise(); + QWidget::update(); +} + + int YQDialog::preferredWidth() { @@ -212,10 +230,12 @@ void YQDialog::activate( bool active ) { +#if 0 if ( active ) { ensureOnlyOneDefaultButton(); } +#endif } Modified: trunk/qt/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQDialog.h?rev=44069&r1=4… ============================================================================== --- trunk/qt/src/YQDialog.h (original) +++ trunk/qt/src/YQDialog.h Thu Jan 31 15:30:44 2008 @@ -203,8 +203,24 @@ **/ YQWizard * ensureOnlyOneDefaultButton( YWidgetListConstIterator begin, YWidgetListConstIterator end ); + + /** + * Internal open() method, called exactly once during the life + * time of the dialog in open(). + * + * Implemented from YDialog. + **/ + virtual void openInternal(); /** + * Activate this dialog: Make sure that it is shown as the topmost dialog + * of this application and that it can receive input. + * + * Implemented from YDialog. + **/ + virtual void activate(); + + /** * Qt event handlers. * * All reimplemented from QWidget. Modified: trunk/qt/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_core.cc?rev=44069&r1… ============================================================================== --- trunk/qt/src/YQUI_core.cc (original) +++ trunk/qt/src/YQUI_core.cc Thu Jan 31 15:30:44 2008 @@ -171,7 +171,7 @@ // Hide the main window for now. The first call to UI::OpenDialog() on an - // `opt(`defaultSize) dialog will trigger a showDialog() call that shows + // `opt(`defaultSize) dialog will trigger a dialog->open() call that shows // the main window - there is nothing to display yet. _main_win->hide(); @@ -523,29 +523,6 @@ } -#warning FIXME Move this to Y(Q)Dialog (and rename it to ::finalize()?) -void YQUI::showDialog( YDialog * dialog ) -{ - QWidget * qw = (QWidget *) dialog->widgetRep(); - - if ( qw ) - { - qw->show(); - qw->raise(); - qw->update(); - } - - ( (YQDialog *) dialog)->ensureOnlyOneDefaultButton(); - - //qApp->processEvents(); -} - - -void YQUI::closeDialog( YDialog * dialog ) -{ -} - - QString YQUI::productName() const { return fromUTF8( YUI::productName() ); Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=44069&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Thu Jan 31 15:30:44 2008 @@ -6,8 +6,8 @@ Summary: - BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-core-devel >= 2.16.24 -Requires: yast2-core >= 2.16.24 +BuildRequires: yast2-core-devel >= 2.16.25 +Requires: yast2-core >= 2.16.25 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 3.11.8 Provides: yast2_ui -- 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] r44068 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_finish.ycp
by jsuchome＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: jsuchome Date: Thu Jan 31 15:03:59 2008 New Revision: 44068 URL: http://svn.opensuse.org/viewcvs/yast?rev=44068&view=rev Log: - call users_finish.ycp from inst_finish.ycp (FATE #302980) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_finish.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Jan 31 15:03:59 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 31 15:02:56 CET 2008 - jsuchome(a)suse.cz + +- call users_finish.ycp from inst_finish.ycp (FATE #302980) + +------------------------------------------------------------------- Thu Jan 31 12:58:42 CET 2008 - locilka(a)suse.cz - Fixed inst_restore_settings client: NetworkDevices are now Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Thu Jan 31 15:03:59 2008 @@ -82,6 +82,7 @@ "ntp-client", "ssh_settings", "save_hw_status", + "users", "autoinst_scripts2", ], ], -- 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] r44067 - in /branches/tmp/tgoettlicher/yast2cc_rewrite/src: kcmoduleinfo.cpp kcmoduleinfo.h
by tgoettlicher＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: tgoettlicher Date: Thu Jan 31 14:43:05 2008 New Revision: 44067 URL: http://svn.opensuse.org/viewcvs/yast?rev=44067&view=rev Log: + kcmoduleinfo Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.h Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.cpp Thu Jan 31 14:43:05 2008 @@ -0,0 +1,201 @@ +/* + Copyright (c) 1999 Matthias Hoelzer-Kluepfel <hoelzer(a)kde.org> + Copyright (c) 2000 Matthias Elter <elter(a)kde.org> + Copyright (c) 2003 Daniel Molkentin <molkentin(a)kde.org> + Copyright (c) 2003,2006 Matthias Kretz <kretz(a)kde.org> + + This file is part of the KDE project + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2, as published by the Free Software Foundation. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "kcmoduleinfo.h" + +#include <QtCore/QVariant> + +//#include <kdesktopfile.h> +//#include <kdebug.h> +//#include <kglobal.h> +//#include <kstandarddirs.h> +//#include <klocale.h> + +class KCModuleInfo::Private +{ + public: + Private(); +// Private( KService::Ptr ); + + QStringList keywords; + QString name, icon, lib, handle, fileName, doc, comment; + bool allLoaded; + int weight; + + //KService::Ptr service; + + /** + * Reads the service entries specific for KCModule from the desktop file. + * The usual desktop entries are read in the Private ctor. + */ + void loadAll(); +}; + +KCModuleInfo::Private::Private() +{ +} + +/*KCModuleInfo::Private::Private( KService::Ptr s ) + : allLoaded( false ) + , service( s ) +{ + if ( !service ) + { + kDebug(712) << "Could not find the service."; + return; + } + + // set the modules simple attributes + name = service->name(); + comment = service->comment(); + icon = service->icon(); + fileName = service->entryPath(); + lib = service->library(); + keywords = service->keywords(); +} +*/ + +KCModuleInfo::KCModuleInfo() +{ + d = new Private; +} + +KCModuleInfo::KCModuleInfo(const QString& desktopFile) +{ +// d = new Private( KService::serviceByStorageId(desktopFile) ); +} + +//KCModuleInfo::KCModuleInfo( KService::Ptr moduleInfo ) +//{ +// d = new Private( moduleInfo ); +//} + +KCModuleInfo::KCModuleInfo( const KCModuleInfo &rhs ) +{ + d = new Private; + ( *this ) = rhs; +} + +KCModuleInfo &KCModuleInfo::operator=( const KCModuleInfo &rhs ) +{ + *d = *(rhs.d); + return *this; +} + +bool KCModuleInfo::operator==( const KCModuleInfo & rhs ) const +{ + return ( ( d->name == rhs.d->name ) && ( d->lib == rhs.d->lib ) && ( d->fileName == rhs.d->fileName ) ); +} + +bool KCModuleInfo::operator!=( const KCModuleInfo & rhs ) const +{ + return ! operator==( rhs ); +} + +KCModuleInfo::~KCModuleInfo() +{ + delete d; +} + +void KCModuleInfo::Private::loadAll() +{ + allLoaded = true; + +// if( !service ) /* We have a bogus service. All get functions will return empty/zero values */ + return; + + // get the documentation path +// doc = service->property( "X-DocPath", QVariant::String ).toString(); +// if (doc.isEmpty()) +// doc = service->property( "DocPath", QVariant::String ).toString(); + + // read weight +// QVariant tmp = service->property( "X-KDE-Weight", QVariant::Int ); +// weight = tmp.isValid() ? tmp.toInt() : 100; + + // factory handle +// tmp = service->property("X-KDE-FactoryName", QVariant::String); +// handle = tmp.isValid() ? tmp.toString() : lib; + +} + +QString KCModuleInfo::fileName() const +{ + return d->fileName; +} + +QStringList KCModuleInfo::keywords() const +{ + return d->keywords; +} + +QString KCModuleInfo::moduleName() const +{ + return d->name; +} + +//KService::Ptr KCModuleInfo::service() const +//{ +// return d->service; +//} + +QString KCModuleInfo::comment() const +{ + return d->comment; +} + +QString KCModuleInfo::icon() const +{ + return d->icon; +} + +QString KCModuleInfo::library() const +{ + return d->lib; +} + +QString KCModuleInfo::docPath() const +{ + if (!d->allLoaded) + d->loadAll(); + + return d->doc; +} + +QString KCModuleInfo::handle() const +{ + if (!d->allLoaded) + d->loadAll(); + + return d->handle; +} + +int KCModuleInfo::weight() const +{ + if (!d->allLoaded) + d->loadAll(); + + return d->weight; +} + +// vim: ts=2 sw=2 et Added: branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.h (added) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/kcmoduleinfo.h Thu Jan 31 14:43:05 2008 @@ -0,0 +1,166 @@ +/* + Copyright (c) 1999 Matthias Hoelzer-Kluepfel <hoelzer(a)kde.org> + Copyright (c) 2000 Matthias Elter <elter(a)kde.org> + Copyright (c) 2003 Daniel Molkentin <molkentin(a)kde.org> + Copyright (c) 2003,2006 Matthias Kretz <kretz(a)kde.org> + + This file is part of the KDE project + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2, as published by the Free Software Foundation. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#ifndef KCMODULEINFO_H +#define KCMODULEINFO_H + +//#include <kutils_export.h> +//#include <kservice.h> + +#include <QString> +#include <QStringList> + +class QString; +class QStringList; + +/** + * A class that provides information about a KCModule + * + * KCModuleInfo provides various technical information, such as icon, library + * etc. about a KCModule.n + * @note Any values set with the set* functions is not + * written back with KCModuleInfo it only reads value from the desktop file. + * + * @internal + * @author Matthias Hoelzer-Kluepfel <mhk(a)kde.org> + * @author Matthias Elter <elter(a)kde.org> + * @author Daniel Molkentin <molkentin(a)kde.org> + * + */ +class KCModuleInfo // krazy:exclude=dpointer (implicitly shared) +{ + +public: + + /** + * Constructs a KCModuleInfo. + * @note a KCModuleInfo object will have to be manually deleted, it is not + * done automatically for you. + * @param desktopFile the desktop file representing the module, or + * the name of the module. + */ + KCModuleInfo(const QString& desktopFile); + + /** + * Same as above but takes a KService::Ptr as argument. + * + * @note @p moduleInfo must be a valid pointer. + * + * @param moduleInfo specifies the module + */ +// KCModuleInfo( KService::Ptr moduleInfo ); + + + /** + * Same as above but takes a KCModuleInfo as argument. + * + * @param rhs specifies the module + */ + KCModuleInfo( const KCModuleInfo &rhs ); + + /** + * Same as above but creates an empty KCModuleInfo. + * You should not normally call this. + */ + KCModuleInfo(); + + /** + * Assignment operator + */ + KCModuleInfo &operator=( const KCModuleInfo &rhs ); + + /** + * Returns true if @p rhs describes the same KCModule as this object. + */ + bool operator==( const KCModuleInfo &rhs ) const; + + /** + * @return true if @p rhs is not equal itself + */ + bool operator!=( const KCModuleInfo &rhs ) const; + + /** + * Default destructor. + */ + ~KCModuleInfo(); + + /** + * @return the filename of the .desktop file that describes the KCM + */ + QString fileName() const; + + /** + * @return the keywords associated with this KCM. + */ + QStringList keywords() const; + + /** + * @return the module\'s (translated) name + */ + QString moduleName() const; + + /** + * @return a KSharedPtr to KService created from the modules .desktop file + */ +// KService::Ptr service() const; + + /** + * @return the module's (translated) comment field + */ + QString comment() const; + + /** + * @return the module's icon name + */ + QString icon() const; + + /** + * @return the path of the module's documentation + */ + QString docPath() const; + + /** + * @return the library name + */ + QString library() const; + + /** + * @return a handle (the contents of the X-KDE-FactoryName field if it exists, + * else the same as the library name) + */ + QString handle() const; + + /** + * @return the weight of the module which determines the order of the pages in + * the KCMultiDialog. It's set by the X-KDE-Weight field. + */ + int weight() const; + +private: + class Private; + Private * d; +}; + +#endif // KCMODULEINFO_H + +// vim: ts=2 sw=2 et -- 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] r44066 - in /branches/tmp/tgoettlicher/yast2cc_rewrite/src: CMakeLists.txt main_window.cpp moduleiconitem.cpp
by tgoettlicher＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: tgoettlicher Date: Thu Jan 31 14:40:42 2008 New Revision: 44066 URL: http://svn.opensuse.org/viewcvs/yast?rev=44066&view=rev Log: + moduleiconitem Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/CMakeLists.txt Thu Jan 31 14:40:42 2008 @@ -11,6 +11,8 @@ kcategorydrawer.cpp kcategorizedsortfilterproxymodel.cpp kcmodulemodel.cpp +moduleiconitem.cpp +kcmoduleinfo.cpp ) @@ -26,7 +28,8 @@ kcmodulemodel.h kcategorydrawer.h kcategorizedsortfilterproxymodel.h - +moduleiconitem.h +kcmoduleinfo.h ) #SET(yast2-control-center_RCCS ../files.qrc) Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/main_window.cpp Thu Jan 31 14:40:42 2008 @@ -9,6 +9,7 @@ #include "menuitem.h" #include "kcmodulemodel.h" #include "kcategorydrawer.h" +#include "moduleiconitem.h" MainWindow::MainWindow() : QMainWindow() { @@ -17,15 +18,6 @@ QWidget *centralWidget = new QWidget; setCentralWidget(centralWidget); - QHBoxLayout *layout = new QHBoxLayout; - centralWidget->setLayout(layout); - - -// KCategorizedView *view = new KCategorizedView(this); - -// layout->addWidget(view); - - MenuItem *rootItem = new MenuItem(true, 0); MenuItem *first = new MenuItem(false, rootItem); @@ -33,7 +25,6 @@ first->caption="hallo"; - // foreach ( MenuItem* item, rootItem->children ) { KCModuleModel *model = new KCModuleModel( first, this ); KCategoryDrawer * drawer = new KCategoryDrawer; @@ -42,7 +33,7 @@ // tv->setSpacing(KDialog::spacingHint()); tv->setCategoryDrawer( drawer ); tv->setViewMode( QListView::IconMode ); -// tv->setItemDelegate( new ModuleIconItemDelegate( this ) ); + tv->setItemDelegate( new ModuleIconItemDelegate( this ) ); tv->setMouseTracking( true ); tv->viewport()->setAttribute( Qt::WA_Hover ); KCategorizedSortFilterProxyModel * kcsfpm = new SystemSettingsProxyModel( this ); @@ -54,6 +45,10 @@ tv->setModel( kcsfpm ); + QHBoxLayout *layout = new QHBoxLayout; + centralWidget->setLayout(layout); + + layout->addWidget(tv); } Modified: branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/tgoettlicher/yast2cc_rewr… ============================================================================== --- branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp (original) +++ branches/tmp/tgoettlicher/yast2cc_rewrite/src/moduleiconitem.cpp Thu Jan 31 14:40:42 2008 @@ -20,9 +20,9 @@ */ #include "moduleiconitem.h" -#include <kiconloader.h> -#include <kdebug.h> -#include <kcmoduleinfo.h> +//#include <kiconloader.h> +//#include <kdebug.h> +#include "kcmoduleinfo.h" #include <climits> @@ -61,9 +61,9 @@ painter->fillPath(roundedRectangle(option.rect, 10), hover); } - if( index.data( Qt::UserRole ).toInt() == KIconLoader::DisabledState ) { - painter->setPen( option.palette.color( QPalette::Disabled, QPalette::Text ) ); - } +// if( index.data( Qt::UserRole ).toInt() == KIconLoader::DisabledState ) { +// painter->setPen( option.palette.color( QPalette::Disabled, QPalette::Text ) ); +// } const QSize &decorationSize = option.decorationSize; QIcon::Mode iconMode = QIcon::Normal; @@ -97,31 +97,31 @@ } ModuleIconItem::ModuleIconItem( QListWidget* parent, const KCModuleInfo& module) - : QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent), + :// QListWidgetItem(SmallIcon( module.icon(), IMAGE_SIZE ), module.moduleName(), parent), imageName(module.icon()) { - setData( Qt::UserRole, KIconLoader::DefaultState ); +// setData( Qt::UserRole, KIconLoader::DefaultState ); modules.append(module); setSize(); } ModuleIconItem::ModuleIconItem( QListWidget* parent, const QString &text, const QString &_imageName ) - : QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ), + : //QListWidgetItem( SmallIcon( _imageName, IMAGE_SIZE ), text, parent ), imageName(_imageName) { - setData( Qt::UserRole, KIconLoader::DefaultState ); +// setData( Qt::UserRole, KIconLoader::DefaultState ); setSize(); } void ModuleIconItem::loadIcon( bool enabled ) { - int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState; - if( newState == data( Qt::UserRole ).toInt() ) +// int newState = enabled ? KIconLoader::DefaultState : KIconLoader::DisabledState; +// if( newState == data( Qt::UserRole ).toInt() ) return; - setData( Qt::UserRole, newState ); - setIcon( DesktopIcon( imageName, IMAGE_SIZE , newState ) ); +// setData( Qt::UserRole, newState ); +// setIcon( DesktopIcon( imageName, IMAGE_SIZE , newState ) ); } void ModuleIconItem::setSize() -- 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] r44065 - /trunk/ncurses/package/yast2-ncurses.changes
by kmachalkova＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: kmachalkova Date: Thu Jan 31 14:37:40 2008 New Revision: 44065 URL: http://svn.opensuse.org/viewcvs/yast?rev=44065&view=rev Log: changelog up Modified: trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Thu Jan 31 14:37:40 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 31 14:22:36 CET 2008 - kmachalkova(a)suse.cz + +- Align numbers in IntFields to the right margin of the label, not + to the right margin of the entire screen (bnc#309118) + +------------------------------------------------------------------- Tue Jan 29 20:04:53 CET 2008 - sh(a)suse.de - YCP-less event handling -- 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] r44064 - /branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp
by varkoly＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: varkoly Date: Thu Jan 31 14:31:57 2008 New Revision: 44064 URL: http://svn.opensuse.org/viewcvs/yast?rev=44064&view=rev Log: New ldap server has to be configured too. Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/s… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp Thu Jan 31 14:31:57 2008 @@ -81,7 +81,7 @@ { WFM::CallFunction("ldap-server",[]); } - if(contains(args,"conf") ) + if(contains(args,"conf") || contains(args,"setup") ) { MailServerLDAP::ConfigureLDAPServer(); } -- 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] r44063 - /trunk/ncurses/src/NCIntField.cc
by kmachalkova＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: kmachalkova Date: Thu Jan 31 14:18:20 2008 New Revision: 44063 URL: http://svn.opensuse.org/viewcvs/yast?rev=44063&view=rev Log: Align numbers in IntFields to the right margin of the label, not to the right margin of the entire screen (bnc#309118) Modified: trunk/ncurses/src/NCIntField.cc Modified: trunk/ncurses/src/NCIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCIntField.cc?rev=44… ============================================================================== --- trunk/ncurses/src/NCIntField.cc (original) +++ trunk/ncurses/src/NCIntField.cc Thu Jan 31 14:18:20 2008 @@ -175,7 +175,7 @@ trect.Sze.H, trect.Sze.W, trect.Pos.L, trect.Pos.C, 'r' ); - vstart = ( vlen + 2 < (unsigned)trect.Sze.W ) ? trect.Sze.W - vlen - 2 : 0; + vstart = ( vlen + 2 < (unsigned)trect.Sze.W ) ? label.width() - vlen - 2 : 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] r44062 - /trunk/qt/src/CMakeLists.txt
by coolo＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: coolo Date: Thu Jan 31 14:09:39 2008 New Revision: 44062 URL: http://svn.opensuse.org/viewcvs/yast?rev=44062&view=rev Log: install the file Mike misses Modified: trunk/qt/src/CMakeLists.txt Modified: trunk/qt/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/CMakeLists.txt?rev=44062&… ============================================================================== --- trunk/qt/src/CMakeLists.txt (original) +++ trunk/qt/src/CMakeLists.txt Thu Jan 31 14:09:39 2008 @@ -93,6 +93,8 @@ INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) +INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/fonts ) + ADD_SUBDIRECTORY(pkg) #SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" ) -- 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] r44061 - /trunk/devtools/devtools/bin/gettextdomains
by mvidner＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: mvidner Date: Thu Jan 31 14:06:29 2008 New Revision: 44061 URL: http://svn.opensuse.org/viewcvs/yast?rev=44061&view=rev Log: y2makepot: look for gettext() in addition to _() and __() (bnc#354678). Modified: trunk/devtools/devtools/bin/gettextdomains Modified: trunk/devtools/devtools/bin/gettextdomains URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/gettextdom… ============================================================================== --- trunk/devtools/devtools/bin/gettextdomains (original) +++ trunk/devtools/devtools/bin/gettextdomains Thu Jan 31 14:06:29 2008 @@ -16,6 +16,7 @@ # search for sourcecode-files SRCFILES=`find $SRCDIR -type d -name testsuite -prune , \ + -type d -name .svn -prune , \ -type f -name "*.ycp" \ -o -name "*.pm" \ -o -name "*.c" \ @@ -37,7 +38,7 @@ # - uncaught _( at line beginning MATCH=`perl -n -e 'print "$ARGV: $_" if not /(\/\/|#)/' $F | \ perl -n -e 'print "$_" if not /\/\*/../\*\//' | \ - perl -n -e 'print "$_" if /[^[:alnum:]_"<]_{1,2}$/../$/'` + perl -n -e 'print "$_" if /[^[:alnum:]_"<](_|__|gettext)$/../$/'` if [ -n "$MATCH" ]; then TR_FILES="$F $TR_FILES" ; fi -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r44060 - /trunk/apparmor/src/agents/
by mvidner＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: mvidner Date: Thu Jan 31 14:04:44 2008 New Revision: 44060 URL: http://svn.opensuse.org/viewcvs/yast?rev=44060&view=rev Log: Added symlinks as a hint to xgettext (bnc#354678). Added: trunk/apparmor/src/agents/README-symlinks trunk/apparmor/src/agents/ag_complain.pm (with props) trunk/apparmor/src/agents/ag_genprof.pm (with props) trunk/apparmor/src/agents/ag_logparse.pm (with props) trunk/apparmor/src/agents/ag_logprof.pm (with props) trunk/apparmor/src/agents/ag_reports_confined.pm (with props) trunk/apparmor/src/agents/ag_reports_ess.pm (with props) trunk/apparmor/src/agents/ag_reports_parse.pm (with props) trunk/apparmor/src/agents/ag_reports_sched.pm (with props) trunk/apparmor/src/agents/ag_sd_config.pm (with props) trunk/apparmor/src/agents/ag_subdomain.pm (with props) trunk/apparmor/src/agents/ag_subdomain_profiles.pm (with props) Added: trunk/apparmor/src/agents/README-symlinks URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/README-symli… ============================================================================== --- trunk/apparmor/src/agents/README-symlinks (added) +++ trunk/apparmor/src/agents/README-symlinks Thu Jan 31 14:04:44 2008 @@ -0,0 +1,7 @@ +To extract the translatable strings from the agents, xgettext needs +a hint about the file type. +A similar situation exists with +http://svn.opensuse.org/svn/yast/trunk/installation/control/control.xml + +See also +https://bugzilla.novell.com/show_bug.cgi?id=354678 Added: trunk/apparmor/src/agents/ag_complain.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_complain.… ============================================================================== --- trunk/apparmor/src/agents/ag_complain.pm (added) +++ trunk/apparmor/src/agents/ag_complain.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_complain \ No newline at end of file Added: trunk/apparmor/src/agents/ag_genprof.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_genprof.p… ============================================================================== --- trunk/apparmor/src/agents/ag_genprof.pm (added) +++ trunk/apparmor/src/agents/ag_genprof.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_genprof \ No newline at end of file Added: trunk/apparmor/src/agents/ag_logparse.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_logparse.… ============================================================================== --- trunk/apparmor/src/agents/ag_logparse.pm (added) +++ trunk/apparmor/src/agents/ag_logparse.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_logparse \ No newline at end of file Added: trunk/apparmor/src/agents/ag_logprof.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_logprof.p… ============================================================================== --- trunk/apparmor/src/agents/ag_logprof.pm (added) +++ trunk/apparmor/src/agents/ag_logprof.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_logprof \ No newline at end of file Added: trunk/apparmor/src/agents/ag_reports_confined.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_c… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_confined.pm (added) +++ trunk/apparmor/src/agents/ag_reports_confined.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_reports_confined \ No newline at end of file Added: trunk/apparmor/src/agents/ag_reports_ess.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_e… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_ess.pm (added) +++ trunk/apparmor/src/agents/ag_reports_ess.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_reports_ess \ No newline at end of file Added: trunk/apparmor/src/agents/ag_reports_parse.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_p… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_parse.pm (added) +++ trunk/apparmor/src/agents/ag_reports_parse.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_reports_parse \ No newline at end of file Added: trunk/apparmor/src/agents/ag_reports_sched.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_reports_s… ============================================================================== --- trunk/apparmor/src/agents/ag_reports_sched.pm (added) +++ trunk/apparmor/src/agents/ag_reports_sched.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_reports_sched \ No newline at end of file Added: trunk/apparmor/src/agents/ag_sd_config.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_sd_config… ============================================================================== --- trunk/apparmor/src/agents/ag_sd_config.pm (added) +++ trunk/apparmor/src/agents/ag_sd_config.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_sd_config \ No newline at end of file Added: trunk/apparmor/src/agents/ag_subdomain.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_subdomain… ============================================================================== --- trunk/apparmor/src/agents/ag_subdomain.pm (added) +++ trunk/apparmor/src/agents/ag_subdomain.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_subdomain \ No newline at end of file Added: trunk/apparmor/src/agents/ag_subdomain_profiles.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/agents/ag_subdomain… ============================================================================== --- trunk/apparmor/src/agents/ag_subdomain_profiles.pm (added) +++ trunk/apparmor/src/agents/ag_subdomain_profiles.pm Thu Jan 31 14:04:44 2008 @@ -0,0 +1 @@ +link ag_subdomain_profiles \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0