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

List:       kde-commits
Subject:    playground/office/kmymoney/kmymoney2/widgets
From:       Laurent Montel <montel () kde ! org>
Date:       2009-05-13 7:33:07
Message-ID: 1242199987.573955.25714.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967292 by mlaurent:

Port++


 M  +5 -5      CMakeLists.txt  
 M  +9 -6      kmymoneyedit.cpp  
 M  +3 -2      kmymoneylineedit.cpp  
 M  +11 -3     kmymoneywizard.cpp  


--- trunk/playground/office/kmymoney/kmymoney2/widgets/CMakeLists.txt #967291:967292
@@ -54,18 +54,18 @@
   kmymoneycompletion.cpp
    #kmymoneycurrencyselector.cpp
    #kmymoneydateinput.cpp
-  kmymoneydatetbl.cpp
+   #kmymoneydatetbl.cpp
   kmymoneyedit.cpp
-  kmymoneylineedit.cpp
+  #kmymoneylineedit.cpp
   kmymoneylistviewitem.cpp
-  kmymoneytitlelabel.cpp
+  #kmymoneytitlelabel.cpp
   kmymoneywizard.cpp
   registeritem.cpp
   scheduledtransaction.cpp
   stdtransactiondownloaded.cpp
   stdtransactionmatched.cpp 
-  transaction.cpp
-  transactionform.cpp
+  #transaction.cpp
+  #transactionform.cpp
   )
 
 # sources that contain the KMM_DESIGNER flag
--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneyedit.cpp \
#967291:967292 @@ -38,6 +38,7 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kconfig.h>
+#include <KConfigGroup>
 
 // ----------------------------------------------------------------------------
 // Project Includes
@@ -140,7 +141,8 @@
     return Acceptable;
 
   QValidator::State rc = QDoubleValidator::validate( s, _p );
-
+#warning "port to kde4"
+#if 0
   if(rc == Acceptable) {
     // If the numeric value is acceptable, we check if the parens
     // are ok. If only the lead-in is present, the return value
@@ -156,6 +158,7 @@
         rc = Invalid;
     }
   }
+#endif  
   return rc;
 }
 
@@ -227,22 +230,22 @@
   m_calculatorFrame->setFixedSize(m_calculator->width()+3, \
m_calculator->height()+3);  m_calculatorFrame->hide();
 
-  m_calcButton = new \
KPushButton(QIcon(QPixmap(KIconLoader::global()->iconPath("kcalc", \
-KIconLoader::SizeSmall))), QString(""), this); +  m_calcButton = new \
KPushButton(KIcon(QPixmap(KIconLoader::global()->iconPath("kcalc", \
-KIconLoader::SizeSmall))), QString(""), this);  m_calcButton->setFixedWidth( \
m_calcButton->sizeHint().width() );  \
m_calcButton->setFixedHeight(m_edit->sizeHint().height());  \
m_calcButton->setFocusProxy(m_edit);  
   QPixmap pixmap;
   pixmap.loadFromData(resetButtonImage, sizeof(resetButtonImage), "PNG", 0);
-  m_resetButton = new KPushButton(QIcon(pixmap), QString(""), this);
+  m_resetButton = new KPushButton(KIcon(pixmap), QString(""), this);
   m_resetButton->setFixedWidth( m_resetButton->sizeHint().width() );
   m_resetButton->setFixedHeight(m_edit->sizeHint().height());
   m_resetButton->setEnabled(false);
   m_resetButton->setFocusProxy(m_edit);
 
-  KConfig *kconfig = KGlobal::config();
-  kconfig->setGroup("General Options");
-  if(kconfig->readBoolEntry("DontShowCalculatorButton", false) == true)
+  KSharedConfigPtr kconfig = KGlobal::config();
+  KConfigGroup grp = kconfig->group("General Options");
+  if(grp.readEntry("DontShowCalculatorButton", false) == true)
     setCalculatorButtonVisible(false);
 
   setSpacing(0);
--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneylineedit.cpp \
#967291:967292 @@ -39,10 +39,11 @@
 #include "kmymoneylineedit.h"
 
 kMyMoneyLineEdit::kMyMoneyLineEdit(QWidget *w, const char* name, bool \
                forceMonetaryDecimalSymbol, int alignment) :
-  KLineEdit(w, name),
+  KLineEdit(w),
   m_forceMonetaryDecimalSymbol(forceMonetaryDecimalSymbol)
 {
-  setAlignment(alignment);
+#warning "port to kde4"	
+  //setAlignment(alignment);
 }
 
 kMyMoneyLineEdit::~kMyMoneyLineEdit()
--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneywizard.cpp \
#967291:967292 @@ -155,7 +155,10 @@
 
   // create stage layout and frame
   m_stepFrame = new Q3Frame(this, "stepFrame");
-  m_stepFrame->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
+#warning "port to kde4"
+#if 0
+  //m_stepFrame->setPaletteBackgroundColor(KGlobalSettings::highlightColor());
+#endif
   m_stepLayout = new Q3VBoxLayout(m_stepFrame, 11, 6, "stepLayout");
   m_stepLayout->addWidget(new QLabel("", m_stepFrame));
   m_stepLayout->addItem(new QSpacerItem(20, 20, QSizePolicy::Minimum, \
QSizePolicy::Expanding)); @@ -168,7 +171,11 @@
   // information when the user selected a different color set using the \
KConfigCenter  m_stepPalette = m_stepLabel->palette();
   QColorGroup::ColorRole role = QColorGroup::Foreground;
-  QColor color = KGlobalSettings::highlightedTextColor();
+  QColor color;
+#warning "port to kde4"
+#if 0
+  QColor color= KGlobalSettings::highlightedTextColor();
+#endif
   m_stepPalette.setColor( QPalette::Active, role, color );
   m_stepPalette.setColor( QPalette::Inactive, role, color );
   m_stepPalette.setColor( QPalette::Disabled, role, color );
@@ -189,7 +196,8 @@
   m_wizardLayout->addLayout(hboxLayout);
 
   resize(QSize(770, 520).expandedTo(minimumSizeHint()));
-  clearWState(WState_Polished);
+#warning "port to kde4"
+  //  clearWState(WState_Polished);
 
   m_titleLabel->setText("No Title specified");
   m_titleLabel->setRightImageFile("pics/titlelabel_background.png");


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