[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi (silent)
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2009-09-06 16:13:47
Message-ID: 1252253627.373123.1974.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1020574 by staniek:

port minor code to Qt4
SVN_SILENT


 M  +2 -1      formeditor/widgetfactory.cpp  
 M  +2 -1      kexidb/drivers/mySQL/mysqlconnection_p.h  
 M  +1 -0      kexidb/drivers/mySQL/mysqldriver.cpp  
 M  +2 -1      main/kexinamewidget.cpp  
 M  +3 -6      main/startup/KexiNewProjectWizard.cpp  
 M  +0 -2      main/startup/KexiProjectSelector.cpp  
 M  +2 -1      migration/importoptionsdlg.cpp  
 M  +1 -1      plugins/forms/kexidbtextwidgetinterface.cpp  
 M  +2 -14     plugins/importexport/csv/kexicsvwidgets.cpp  
 M  +2 -2      widget/tableview/kexiinputtableedit.cpp  


--- trunk/koffice/kexi/formeditor/widgetfactory.cpp #1020573:1020574
@@ -205,7 +205,8 @@
     dialog.setButtons(KDialog::Ok | KDialog::Cancel);
 
     KEditListBox *edit = new KEditListBox(
-        i18n("Contents of %1", w->objectName()), &dialog, "editlist");
+        i18n("Contents of %1", w->objectName()), &dialog);
+    edit->setObjectName("editlist");
     dialog.setMainWidget(edit);
     edit->insertStringList(list);
 
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqlconnection_p.h #1020573:1020574
@@ -23,7 +23,8 @@
 #include <kexidb/connection_p.h>
 
 #ifdef Q_WS_WIN
-#include <my_global.h>
+# undef _WIN32_WINNT // avoid redef.
+# include <my_global.h>
 #endif
 #include <mysql_version.h>
 #include <mysql.h>
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqldriver.cpp #1020573:1020574
@@ -30,6 +30,7 @@
 #include <QFile>
 
 #ifdef Q_WS_WIN
+# undef _WIN32_WINNT // avoid redef.
 # include <config-win.h>
 #endif
 #include <mysql_version.h>
--- trunk/koffice/kexi/main/kexinamewidget.cpp #1020573:1020574
@@ -67,7 +67,8 @@
     lbl_message->setObjectName("message");
     setMessageText(message);
     lbl_message->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-    lbl_message->setAlignment(Qt::AlignTop | Qt::TextWordWrap);
+    lbl_message->setAlignment(Qt::AlignTop|Qt::Left);
+    lbl_message->setWordWrap(true);
     lyr->addWidget(lbl_message, 0, 0, 1, 2);
 
     lbl_caption = new QLabel(captionLabel.isEmpty() ? i18n("Caption:") : \
                captionLabel,
--- trunk/koffice/kexi/main/startup/KexiNewProjectWizard.cpp #1020573:1020574
@@ -51,8 +51,6 @@
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <q3header.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
 
 KexiNewPrjTypeSelector::KexiNewPrjTypeSelector(QWidget* parent)
         : QWidget(parent)
@@ -161,9 +159,8 @@
 
     //page: connection selector
     m_conn_sel_widget = new QWidget(this);
-    Q3VBoxLayout* conn_sel_lyr = new Q3VBoxLayout(m_conn_sel_widget);
-    QLabel *conn_sel_label = new QLabel(i18n("Enter a new Kexi project's file \
                name:"),
-                                        m_conn_sel_widget);
+    QVBoxLayout* conn_sel_lyr = new QVBoxLayout(m_conn_sel_widget);
+    QLabel *conn_sel_label = new QLabel(i18n("Enter a new Kexi project's file \
name:"));  conn_sel_label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
     conn_sel_label->setWordWrap(true);
     conn_sel_lyr->addWidget(conn_sel_label);
@@ -204,7 +201,7 @@
     m_server_db_name = new KexiServerDBNamePage(this);
     m_server_db_name->setObjectName("KexiServerDBNamePage");
     d->server_db_name_dblist_lbl_txt
-    = I18N_NOOP("Existing project databases on <b>%1</b> database server:");
+        = I18N_NOOP("Existing project databases on <b>%1</b> database server:");
     connect(m_server_db_name->le_caption, SIGNAL(textChanged(const QString&)),
             this, SLOT(slotServerDBCaptionTxtChanged(const QString&)));
     connect(m_server_db_name->le_dbname, SIGNAL(textChanged(const QString&)),
--- trunk/koffice/kexi/main/startup/KexiProjectSelector.cpp #1020573:1020574
@@ -34,8 +34,6 @@
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <q3listview.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
 #include <QPixmap>
 
 #include <assert.h>
--- trunk/koffice/kexi/migration/importoptionsdlg.cpp #1020573:1020574
@@ -61,7 +61,8 @@
              "if the database was created on a computer with a different character \
set.</p>",  QDir::convertSeparators(databaseFile)),
         plainPage);
-    lbl->setAlignment(Qt::AlignLeft | Qt::TextWordWrap);
+    lbl->setAlignment(Qt::AlignLeft);
+    lbl->setWordWrap(true);
     lbl->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     lyr->addWidget(lbl, 0, 0, 1, 3);
 
--- trunk/koffice/kexi/plugins/forms/kexidbtextwidgetinterface.cpp #1020573:1020574
@@ -55,7 +55,7 @@
             if (w->hasFocus()) {
                 p->setPen(
                     KexiUtils::blendedColors(
-                        m_autonumberDisplayParameters->textColor, \
w->palette().active().base(), 1, 3)); +                        \
m_autonumberDisplayParameters->textColor, w->palette().color(QPalette::Base), 1, 3)); \
}  KexiUtils::WidgetMargins margins(w);
             KexiDisplayUtils::paintAutonumberSign(*m_autonumberDisplayParameters, p,
--- trunk/koffice/kexi/plugins/importexport/csv/kexicsvwidgets.cpp #1020573:1020574
@@ -211,13 +211,7 @@
     m_fnameLbl->setWordWrap(true);
     hbox->addSpacing(5);
     hbox->addWidget(m_iconLbl);
-    hbox->addWidget(m_fnameLbl, 1, Qt::AlignVCenter | Qt::AlignLeft
-#ifdef __GNUC__
-#warning TODO | Qt::TextWordWrap
-#else
-#pragma WARNING( TODO | Qt::TextWordWrap )
-#endif
-                   );
+    hbox->addWidget(m_fnameLbl, 1, Qt::AlignVCenter | Qt::AlignLeft);
     hbox->addSpacing(10);
     m_commentLbl = new QLabel(this);
     m_commentLbl->setOpenExternalLinks(true);
@@ -229,13 +223,7 @@
     m_commentLbl->setFrameStyle(QFrame::Box);
     m_commentLbl->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
     m_commentLbl->setWordWrap(true);
-    hbox->addWidget(m_commentLbl, 0, Qt::AlignVCenter | Qt::AlignRight
-#ifdef __GNUC__
-#warning TODO | Qt::TextWordWrap
-#else
-#pragma WARNING( TODO | Qt::TextWordWrap )
-#endif
-                   );
+    hbox->addWidget(m_commentLbl, 0, Qt::AlignVCenter | Qt::AlignRight);
 
     m_separator = new QFrame(this);
     m_separator->setFrameShape(QFrame::HLine);
--- trunk/koffice/kexi/widget/tableview/kexiinputtableedit.cpp #1020573:1020574
@@ -48,7 +48,7 @@
     MyLineEdit(QWidget *parent) : KLineEdit(parent) {}
 protected:
     virtual void drawFrame(QPainter * p) {
-        p->setPen(QPen(colorGroup().text()));
+        p->setPen(palette().text());
         QRect r = rect();
         p->drawLine(r.topLeft(), r.topRight());
         p->drawLine(r.topRight(), r.bottomRight());
@@ -157,7 +157,7 @@
 void KexiInputTableEdit::paintEvent(QPaintEvent * /*e*/)
 {
     QPainter p(this);
-    p.setPen(QPen(colorGroup().text()));
+    p.setPen(palette().text());
     p.drawRect(rect());
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]