[yast-commit] r44196 - in /trunk: core/libyui/src/ ncurses/src/ qt/src/

6 Feb 2008

Author: sh-sh-sh
Date: Wed Feb  6 15:36:12 2008
New Revision: 44196

URL: http://svn.opensuse.org/viewcvs/yast?rev=44196&view=rev
Log:
moved from YUI to YApplication

Modified:
    trunk/core/libyui/src/ChangeLog
    trunk/core/libyui/src/YApplication.cc
    trunk/core/libyui/src/YApplication.h
    trunk/core/libyui/src/YUI.h
    trunk/core/libyui/src/YUI_builtins.cc
    trunk/core/libyui/src/YUI_core.cc
    trunk/ncurses/src/NCRichText.cc
    trunk/qt/src/YQRichText.cc
    trunk/qt/src/YQUI.h
    trunk/qt/src/YQUI_builtins.cc
    trunk/qt/src/YQUI_core.cc
    trunk/qt/src/YQWizard.cc

Modified: trunk/core/libyui/src/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/ChangeLog?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================

--- trunk/core/libyui/src/ChangeLog (original)
+++ trunk/core/libyui/src/ChangeLog Wed Feb  6 15:36:12 2008
@@ -514,3 +514,5 @@
   - YMacro::record()
   - YMacro::play()
   ...
+
+* Moved productName() and setProductName() from YUI to YApplication
\ No newline at end of file

Modified: trunk/core/libyui/src/YApplication.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YApplication.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/core/libyui/src/YApplication.cc (original)
+++ trunk/core/libyui/src/YApplication.cc Wed Feb  6 15:36:12 2008
@@ -36,7 +36,12 @@
 
 struct YApplicationPrivate
 {
+    YApplicationPrivate()
+	: productName( "openSUSE" )
+	{}
+    
     string		iconBasePath;
+    string		productName;
     YFunctionKeyMap	defaultFunctionKey;
 };
 
@@ -79,6 +84,19 @@
     priv->iconBasePath = newIconBasePath;
 }
 
+void
+YApplication::setProductName( const string & productName )
+{
+    priv->productName = productName;
+}
+
+
+string
+YApplication::productName() const
+{
+    return priv->productName;
+}
+
 
 int
 YApplication::defaultFunctionKey( const string & label ) const

Modified: trunk/core/libyui/src/YApplication.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YApplication.h?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/core/libyui/src/YApplication.h (original)
+++ trunk/core/libyui/src/YApplication.h Wed Feb  6 15:36:12 2008
@@ -226,6 +226,21 @@
      **/
     virtual int runInTerminal( const string & command );
 
+    /**
+     * Set the current product name ("openSUSE", "SLES", ...).
+     * This name will be expanded in help texts when the &product; entity is
+     * used. 
+     *
+     * Derived classes can overwrite this method, but they should call this
+     * base class method at the beginning of the new implementation.
+     **/
+    virtual void setProductName( const string & productName );
+
+    /**
+     * Set the current product name ("openSUSE", "SLES", ...).
+     **/
+    string productName() const;
+
 
     //
     // Display information.

Modified: trunk/core/libyui/src/YUI.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI.h?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/core/libyui/src/YUI.h (original)
+++ trunk/core/libyui/src/YUI.h Wed Feb  6 15:36:12 2008
@@ -202,15 +202,6 @@
     virtual void internalError( const char *msg );
 
     /**
-     * Returns the current product name
-     * ("SuSE Linux", "SuSE Linux Enterprise Server", "United Linux", etc.).
-     *
-     * This can be set with the UI::SetProductName() builtin.
-     * UI::GetProductName is the YCP equivalent to this function.
-     **/
-    string productName() const { return _productName; }
-
-    /**
      * Convert logical layout spacing units into device dependent units.
      * A default size dialog is assumed to be 80x25 layout spacing units.
      *
@@ -547,11 +538,6 @@
     bool terminate_ui_thread;
 
     /**
-     * The current product name ("SuSE Linux", "United Linux", ...).
-     **/
-    string _productName;
-
-    /**
      * Queue for synthetic (faked) user input events.
      **/
     deque<YCPValue> fakeUserInputQueue;

Modified: trunk/core/libyui/src/YUI_builtins.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_builtins.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/core/libyui/src/YUI_builtins.cc (original)
+++ trunk/core/libyui/src/YUI_builtins.cc Wed Feb  6 15:36:12 2008
@@ -183,7 +183,7 @@
  **/
 YCPString YUI::evaluateGetProductName()
 {
-    return YCPString( _productName );
+    return YCPString( YUI::app()->productName() );
 }
 
 
@@ -208,7 +208,7 @@
  **/
 void YUI::evaluateSetProductName( const YCPString & name )
 {
-    _productName = name->value();
+    YUI::app()->setProductName( name->value() );
 }
 
 

Modified: trunk/core/libyui/src/YUI_core.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YUI_core.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/core/libyui/src/YUI_core.cc (original)
+++ trunk/core/libyui/src/YUI_core.cc Wed Feb  6 15:36:12 2008
@@ -76,7 +76,6 @@
 YUI::YUI( bool withThreads )
     : _withThreads( withThreads )
     , _uiThread( 0 )
-    , _productName( "SUSE Linux" )
     , _eventsBlocked( false )
     , _callback( 0 )
 {

Modified: trunk/ncurses/src/NCRichText.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/ncurses/src/NCRichText.cc (original)
+++ trunk/ncurses/src/NCRichText.cc Wed Feb  6 15:36:12 2008
@@ -24,6 +24,7 @@
 #include <sstream>
 
 #include "YMenuItem.h"
+#include "YApplication.h"
 
 #if 0
 #undef  DBG_CLASS
@@ -74,7 +75,7 @@
     // initialize replacement for character entities. A value of NULL
     // means do not replace.
     wstring product;
-    NCstring::RecodeToWchar( YNCursesUI::ui()->productName(), "UTF-8", &product);
+    NCstring::RecodeToWchar( YUI::app()->productName(), "UTF-8", &product);
 
     REP(L"amp", L"&");
     REP(L"gt", L">");

Modified: trunk/qt/src/YQRichText.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/qt/src/YQRichText.cc (original)
+++ trunk/qt/src/YQRichText.cc Wed Feb  6 15:36:12 2008
@@ -25,6 +25,7 @@
 #include <QKeyEvent>
 #include <QVBoxLayout>
 
+#include "YApplication.h"
 #include "YEvent.h"
 #include "utf8.h"
 #include "YQUI.h"
@@ -88,7 +89,7 @@
 
     if ( ! plainTextMode() )
     {
-          text.replace( "&product;", YQUI::ui()->productName() );
+          text.replace( "&product;", fromUTF8( YUI::app()->productName() ) );
           _textBrowser->setHtml( text );
     }
     else

Modified: trunk/qt/src/YQUI.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI.h?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/qt/src/YQUI.h (original)
+++ trunk/qt/src/YQUI.h Wed Feb  6 15:36:12 2008
@@ -205,13 +205,6 @@
     virtual bool eventsBlocked() const;
 
     /**
-     * Returns the current product name
-     * ("SuSE Linux", "SuSE Linux Enterprise Server", "United Linux", etc.)
-     * as QString.
-     **/
-    QString productName() const;
-
-    /**
      * Beep - activate the system (X11) bell.
      *
      * Reimplemented from YUI.

Modified: trunk/qt/src/YQUI_builtins.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_builtins.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/qt/src/YQUI_builtins.cc (original)
+++ trunk/qt/src/YQUI_builtins.cc Wed Feb  6 15:36:12 2008
@@ -144,9 +144,7 @@
         // Figure out a file name
         //
 
-        const char * baseName = moduleName();
-        if ( ! baseName )
-	    baseName = "scr";
+        const char * baseName = "yast2-";
 	
         int no = screenShotNo[ baseName ];
         fileName.sprintf( qPrintable( screenShotNameTemplate ), baseName, no );

Modified: trunk/qt/src/YQUI_core.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQUI_core.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/qt/src/YQUI_core.cc (original)
+++ trunk/qt/src/YQUI_core.cc Wed Feb  6 15:36:12 2008
@@ -505,12 +505,6 @@
 }
 
 
-QString YQUI::productName() const
-{
-    return fromUTF8( YUI::productName() );
-}
-
-
 void
 YQUI::setTextdomain( const char * domain )
 {

Modified: trunk/qt/src/YQWizard.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=44196&r1=44195&r2=44196&view=diff
==============================================================================
--- trunk/qt/src/YQWizard.cc (original)
+++ trunk/qt/src/YQWizard.cc Wed Feb  6 15:36:12 2008
@@ -841,7 +841,7 @@
 void YQWizard::setHelpText( const string & helpText )
 {
     _qHelpText = fromUTF8( helpText );
-    _qHelpText.replace( "&product;", YQUI::ui()->productName() );
+    _qHelpText.replace( "&product;", fromUTF8( YUI::app()->productName() ) );
 }
 
 

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r44196 - in /trunk: core/libyui/src/ ncurses/src/ qt/src/

sh-sh-sh＠svn.opensuse.org