Mailinglist Archive: yast-commit (819 mails)

< Previous Next >
[yast-commit] r54568 - in /trunk/qt: package/yast2-qt.changes src/QY2HelpDialog.cc src/QY2HelpDialog.h src/YQApplication.cc src/YQWizard.cc
  • From: tgoettlicher@xxxxxxxxxxxxxxxx
  • Date: Tue, 13 Jan 2009 13:00:27 -0000
  • Message-id: <E1LMisd-0004cL-3G@xxxxxxxxxxxxxxxx>
Author: tgoettlicher
Date: Tue Jan 13 14:00:26 2009
New Revision: 54568

URL: http://svn.opensuse.org/viewcvs/yast?rev=54568&view=rev
Log:
Fixed bnc #445951: Help dialog untranslated


Modified:
trunk/qt/package/yast2-qt.changes
trunk/qt/src/QY2HelpDialog.cc
trunk/qt/src/QY2HelpDialog.h
trunk/qt/src/YQApplication.cc
trunk/qt/src/YQWizard.cc

Modified: trunk/qt/package/yast2-qt.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=54568&r1=54567&r2=54568&view=diff
==============================================================================
--- trunk/qt/package/yast2-qt.changes (original)
+++ trunk/qt/package/yast2-qt.changes Tue Jan 13 14:00:26 2009
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Jan 13 13:57:01 CET 2009 - tgoettlicher@xxxxxxx
+
+- Fixed bnc #445951: Help dialog untranslated
+
+-------------------------------------------------------------------
Fri Jan 9 16:59:12 CET 2009 - tgoettlicher@xxxxxxx

- Fixed bnc #458975: Text cropped in treewidget

Modified: trunk/qt/src/QY2HelpDialog.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2HelpDialog.cc?rev=54568&r1=54567&r2=54568&view=diff
==============================================================================
--- trunk/qt/src/QY2HelpDialog.cc (original)
+++ trunk/qt/src/QY2HelpDialog.cc Tue Jan 13 14:00:26 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: trunk/qt/src/QY2HelpDialog.h
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/QY2HelpDialog.h?rev=54568&r1=54567&r2=54568&view=diff
==============================================================================
--- trunk/qt/src/QY2HelpDialog.h (original)
+++ trunk/qt/src/QY2HelpDialog.h Tue Jan 13 14:00:26 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: trunk/qt/src/YQApplication.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=54568&r1=54567&r2=54568&view=diff
==============================================================================
--- trunk/qt/src/YQApplication.cc (original)
+++ trunk/qt/src/YQApplication.cc Tue Jan 13 14:00:26 2009
@@ -78,6 +78,7 @@
YQApplication::setLanguage( const string & language,
const string & encoding )
{
+ return;
YApplication::setLanguage( language, encoding );
loadPredefinedQtTranslations();


Modified: trunk/qt/src/YQWizard.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQWizard.cc?rev=54568&r1=54567&r2=54568&view=diff
==============================================================================
--- trunk/qt/src/YQWizard.cc (original)
+++ trunk/qt/src/YQWizard.cc Tue Jan 13 14:00:26 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@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages