Author: tgoettlicher Date: Wed Jan 14 11:00:44 2009 New Revision: 54604 URL: http://svn.opensuse.org/viewcvs/yast?rev=54604&view=rev Log: - Fixed bnc #445951: Help dialog untranslated - V 2.17.27 Modified: branches/SuSE-Code-11-Branch/qt/VERSION.cmake branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.cc branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.h branches/SuSE-Code-11-Branch/qt/src/YQWizard.cc Modified: branches/SuSE-Code-11-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/VERSION.cmake?rev=54604&r1=54603&r2=54604&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-Branch/qt/VERSION.cmake Wed Jan 14 11:00:44 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "26") +SET(VERSION_PATCH "27") Modified: branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes?rev=54604&r1=54603&r2=54604&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes Wed Jan 14 11:00:44 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 13 17:03:58 CET 2009 - tgoettlicher@suse.de + +- Fixed bnc #445951: Help dialog untranslated +- V 2.17.27 + +------------------------------------------------------------------- Wed Jan 7 16:43:19 CET 2009 - sh@suse.de - Fixed bnc #461617: Glyph ArrowLeft / ArrowRight in Arabic Modified: branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.cc?rev=54604&r1=54603&r2=54604&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.cc (original) +++ branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.cc Wed Jan 14 11:00:44 2009 @@ -23,9 +23,16 @@ #include <QDebug> #include <QTextObject> #include "YQi18n.h" +#include "YQUI.h" #include "icons/viewmag.xpm" +#ifdef TEXTDOMAIN +# undef TEXTDOMAIN +#endif + +#define TEXTDOMAIN "qt" + QY2HelpDialog::QY2HelpDialog( const QString& helpText, QWidget *parent ) : QDialog( parent ) @@ -41,6 +48,8 @@ _ui->lineEdit->setFocus( Qt::OtherFocusReason ); _ui->pushButton->setAutoDefault(false); + YQUI::setTextdomain( TEXTDOMAIN ); + // Window title for help wizard window setWindowTitle( _( "Help" ) ); @@ -83,4 +92,11 @@ } } +void QY2HelpDialog::retranslate() +{ + setWindowTitle( _( "Help" ) ); + _ui->pushButton->setText( _( "&Close" ) ); +} + + #include "QY2HelpDialog.moc" Modified: branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.h?rev=54604&r1=54603&r2=54604&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.h (original) +++ branches/SuSE-Code-11-Branch/qt/src/QY2HelpDialog.h Wed Jan 14 11:00:44 2009 @@ -14,6 +14,7 @@ QY2HelpDialog( const QString &helpText, QWidget *parent ); ~QY2HelpDialog(); void setHelpText( const QString &helpText ); + void retranslate(); public slots: void searchStringChanged( QString ); @@ -21,6 +22,8 @@ private: Ui_QHelpDialog *_ui; QList<QTextCursor> _marks; + + }; #endif Modified: branches/SuSE-Code-11-Branch/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/src/YQWizard.cc?rev=54604&r1=54603&r2=54604&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/src/YQWizard.cc (original) +++ branches/SuSE-Code-11-Branch/qt/src/YQWizard.cc Wed Jan 14 11:00:44 2009 @@ -1198,6 +1198,10 @@ if ( _treeButton ) // "Tree" button - intentionally without keyboard shortcut _treeButton->setText( _( "Tree" ) ); + + if ( _helpDlg ) + _helpDlg->retranslate(); + } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org