Changeset 4793

Timestamp:

11/30/06 07:02:54 (2 years ago)

Author:

erijo

Message:

Moved CColorOption to its own file (in a new "widgets" directory) and renamed it to CColorButton.

Location:

branches/qt-gui_qt4/src

Files:

• CMakeLists.txt (modified) (1 diff)
• optionsdlg.cpp (modified) (6 diffs)
• optionsdlg.h (modified) (3 diffs)
• widgets (added)
• widgets/colorbutton.cpp (added)
• widgets/colorbutton.h (added)

branches/qt-gui_qt4/src/CMakeLists.txt

@@ +1 @@
+# Widgets
+set(widgets_SRCS
+  widgets/colorbutton.cpp
+)
+
 # Sources common for both Qt- and KDE-GUI
 set(Qt-GUI_SRCS
+  ${widgets_SRCS}
   adduserdlg.cpp
   authuserdlg.cpp

branches/qt-gui_qt4/src/optionsdlg.cpp

@@ -20 +20 @@
 
 #include "config.h"
+
+#include "widgets/colorbutton.h"
 
 #include <Qt/qdir.h>
@@ -235 +237 @@
   chkLineBreak->setChecked(mainwin->m_bAppendLineBreak);
   cmbStyle->setCurrentItem(mainwin->m_nMsgStyle);
-  btnColorRcv->setPaletteBackgroundColor(mainwin->m_colorRcv);
-  btnColorSnt->setPaletteBackgroundColor(mainwin->m_colorSnt);
-  btnColorRcvHistory->setPaletteBackgroundColor(mainwin->m_colorRcvHistory);
-  btnColorSntHistory->setPaletteBackgroundColor(mainwin->m_colorSntHistory);
-  btnColorNotice->setPaletteBackgroundColor(mainwin->m_colorNotice);
-  /*btnColorTabLabel->setPaletteBackgroundColor(mainwin->m_colorTab);*/
-  btnColorTypingLabel->setPaletteBackgroundColor(mainwin->m_colorTabTyping);
-  btnColorChatBkg->setPaletteBackgroundColor(mainwin->m_colorChatBkg);
+  btnColorRcv->setColor(mainwin->m_colorRcv);
+  btnColorSnt->setColor(mainwin->m_colorSnt);
+  btnColorRcvHistory->setColor(mainwin->m_colorRcvHistory);
+  btnColorSntHistory->setColor(mainwin->m_colorSntHistory);
+  btnColorNotice->setColor(mainwin->m_colorNotice);
+  /*btnColorTabLabel->setColor(mainwin->m_colorTab);*/
+  btnColorTypingLabel->setColor(mainwin->m_colorTabTyping);
+  btnColorChatBkg->setColor(mainwin->m_colorChatBkg);
   slot_refresh_msgViewer();
   
@@ -533 +535 @@
   mainwin->m_nMsgStyle = cmbStyle->currentItem();
   mainwin->m_nDateFormat = getCurrentDateFormat();
-  mainwin->m_colorRcv = btnColorRcv->paletteBackgroundColor();
-  mainwin->m_colorSnt = btnColorSnt->paletteBackgroundColor();
-  mainwin->m_colorRcvHistory = btnColorRcvHistory->paletteBackgroundColor();
-  mainwin->m_colorSntHistory = btnColorSntHistory->paletteBackgroundColor();
-  mainwin->m_colorNotice = btnColorNotice->paletteBackgroundColor();
-  /*mainwin->m_colorTab = btnColorTabLabel->paletteBackgroundColor();*/
-  mainwin->m_colorTabTyping = btnColorTypingLabel->paletteBackgroundColor();
-  mainwin->m_colorChatBkg = btnColorChatBkg->paletteBackgroundColor();
+  mainwin->m_colorRcv = btnColorRcv->getColor();
+  mainwin->m_colorSnt = btnColorSnt->getColor();
+  mainwin->m_colorRcvHistory = btnColorRcvHistory->getColor();
+  mainwin->m_colorSntHistory = btnColorSntHistory->getColor();
+  mainwin->m_colorNotice = btnColorNotice->getColor();
+  /*mainwin->m_colorTab = btnColorTabLabel->getColor();*/
+  mainwin->m_colorTabTyping = btnColorTypingLabel->getColor();
+  mainwin->m_colorChatBkg = btnColorChatBkg->getColor();
 
   mainwin->m_bTabbedChatting = chkTabbedChatting->isChecked();
@@ -1637 +1639 @@
 
   new QLabel(tr("Message Received:"), boxColors);
-  btnColorRcv = new CColorOption(boxColors);
+  btnColorRcv = new CColorButton(boxColors);
 
   new QLabel(tr("Message Sent:"), boxColors);
-  btnColorSnt = new CColorOption(boxColors);
+  btnColorSnt = new CColorButton(boxColors);
 
   new QLabel(tr("History Received:"), boxColors);
-  btnColorRcvHistory = new CColorOption(boxColors);
+  btnColorRcvHistory = new CColorButton(boxColors);
 
   new QLabel(tr("History Sent:"), boxColors);
-  btnColorSntHistory = new CColorOption(boxColors);
+  btnColorSntHistory = new CColorButton(boxColors);
 
   new QLabel(tr("Notice:"), boxColors);
-  btnColorNotice = new CColorOption(boxColors);
+  btnColorNotice = new CColorButton(boxColors);
 
   /*new QLabel(tr("Tab Label Color:"), boxColors);
-  btnColorTabLabel = new CColorOption(boxColors);*/
+  btnColorTabLabel = new CColorButton(boxColors);*/
 
   new QLabel(tr("Typing Notification Color:"), boxColors);
-  btnColorTypingLabel = new CColorOption(boxColors);
+  btnColorTypingLabel = new CColorButton(boxColors);
 
   new QLabel(tr("Background Color:"), boxColors);
-  btnColorChatBkg = new CColorOption(boxColors);
+  btnColorChatBkg = new CColorButton(boxColors);
 
   connect(btnColorSnt, SIGNAL(changed()), this, SLOT(slot_refresh_msgViewer()));
@@ -1707 +1709 @@
   msgViewer->m_nMsgStyle = cmbStyle->currentItem();
   msgViewer->m_bAppendLineBreak = chkLineBreak->isChecked();
-  msgViewer->m_colorSnt = btnColorSnt->paletteBackgroundColor();
-  msgViewer->m_colorRcv = btnColorRcv->paletteBackgroundColor();
-  msgViewer->m_colorSntHistory = btnColorSntHistory->paletteBackgroundColor();
-  msgViewer->m_colorRcvHistory = btnColorRcvHistory->paletteBackgroundColor();
-  msgViewer->m_colorNotice = btnColorNotice->paletteBackgroundColor();
-  tabViewer->setPaletteForegroundColor(btnColorTypingLabel->paletteBackgroundColor());
-  msgViewer->setPaletteBackgroundColor(btnColorChatBkg->paletteBackgroundColor());
+  msgViewer->m_colorSnt = btnColorSnt->getColor();
+  msgViewer->m_colorRcv = btnColorRcv->getColor();
+  msgViewer->m_colorSntHistory = btnColorSntHistory->getColor();
+  msgViewer->m_colorRcvHistory = btnColorRcvHistory->getColor();
+  msgViewer->m_colorNotice = btnColorNotice->getColor();
+  tabViewer->setPaletteForegroundColor(btnColorTypingLabel->getColor());
+  msgViewer->setPaletteForegroundColor(btnColorChatBkg->getColor());
 
   msgViewer->m_nDateFormat = getCurrentDateFormat();
@@ -1730 +1732 @@
 }
 
-CColorOption::CColorOption (QWidget* parent)
-    : QPushButton(parent) 
-{
-  setFixedSize(40, 20);
-  connect(this, SIGNAL(clicked()), this, SLOT(slot_select_color()));
-}
-
-void CColorOption::slot_select_color()
-{
-  QColor color = QColorDialog::getColor(
-      paletteBackgroundColor(), this);
-  if (color.isValid()) 
-  {
-    setPaletteBackgroundColor(color);
-    emit changed();
-  }
-}
-
 // -----------------------------------------------------------------------------
 QWidget* OptionsDlg::new_phone_options()

branches/qt-gui_qt4/src/optionsdlg.h

@@ -29 +29 @@
 #include <QtGui/QLabel>
 
+class CColorButton;
 class CMainWindow;
 class MLEditWrap;
@@ -56 +57 @@
 };
 #endif
-
-class CColorOption : public QPushButton
-{
-   Q_OBJECT
-public:
-   CColorOption (QWidget* parent=0);
-
-signals:
-   void changed();
-   
-protected slots:
-     void slot_select_color();
-};
 
 class OptionsDlg : public LicqDialog
@@ -169 +157 @@
    QLineEdit *customDateFormat;
    QCheckBox *chkLineBreak;
-   CColorOption *btnColorRcv;
-   CColorOption *btnColorSnt;
-   CColorOption *btnColorRcvHistory;
-   CColorOption *btnColorSntHistory;
-   CColorOption *btnColorNotice;
-   CColorOption *btnColorTabLabel;
-   CColorOption *btnColorTypingLabel;
-   CColorOption *btnColorChatBkg;
+   CColorButton *btnColorRcv;
+   CColorButton *btnColorSnt;
+   CColorButton *btnColorRcvHistory;
+   CColorButton *btnColorSntHistory;
+   CColorButton *btnColorNotice;
+   CColorButton *btnColorTabLabel;
+   CColorButton *btnColorTypingLabel;
+   CColorButton *btnColorChatBkg;
    // Phone & celluar tab
    QWidget* new_phone_options();