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

List:       kde-commits
Subject:    =?utf-8?q?=5Bknights/2=2E3=5D_src/proto=3A_Hide_convenience_cons?=
From:       Miha Čančula <miha.cancula () gmail ! com>
Date:       2011-03-06 16:16:26
Message-ID: 20110306161626.BC2F3A60B0 () git ! kde ! org
[Download RAW message or body]

Git commit 0fcfb43b7d18bd75b72fcd85c8637a55db04afc9 by Miha Čančula.
Committed on 06/03/2011 at 17:16.
Pushed by mihac into branch '2.3'.

Hide convenience console buttons when they're not useful anymore.

M  +5    -0    src/proto/chatwidget.cpp     
M  +3    -1    src/proto/chatwidget.h     
M  +31   -30   src/proto/chatwidget.ui     
M  +1    -0    src/proto/ficsprotocol.cpp     

http://commits.kde.org/knights/0fcfb43b7d18bd75b72fcd85c8637a55db04afc9

diff --git a/src/proto/chatwidget.cpp b/src/proto/chatwidget.cpp
index fa209f9..1e3e7c9 100644
--- a/src/proto/chatwidget.cpp
+++ b/src/proto/chatwidget.cpp
@@ -148,6 +148,11 @@ void ChatWidget::addExtraButton ( const QString& text, const QString& title, con
     connect ( button, SIGNAL(clicked(bool)), SLOT(buttonClicked()) );
 }
 
+void ChatWidget::setExtraButtonsShown(bool show)
+{
+    ui->buttonContainer->setVisible(show);
+}
+
 void ChatWidget::buttonClicked()
 {
     QObject* s = sender();
diff --git a/src/proto/chatwidget.h b/src/proto/chatwidget.h
index 4afcdf6..63ca54a 100644
--- a/src/proto/chatwidget.h
+++ b/src/proto/chatwidget.h
@@ -76,7 +76,8 @@ namespace Knights
 	    void addText ( const QString& text, MessageType type );
 	    void addText ( const QByteArray& text, MessageType type );
 	    void addText ( const Message& message );
-            void setPasswordMode ( bool pwMode );
+        void setPasswordMode ( bool pwMode );
+        void setExtraButtonsShown ( bool show );
 
     private slots:
             void sendButtonClicked ( );
@@ -90,6 +91,7 @@ namespace Knights
       QMap<QObject*, QString> m_extraButtons;
       QMap<MessageType, QColor> m_colors;
       bool m_consoleMode;
+      bool m_extraButtonsShown();
     };
 
 }
diff --git a/src/proto/chatwidget.ui b/src/proto/chatwidget.ui
index 82ff8b7..c5ab84a 100644
--- a/src/proto/chatwidget.ui
+++ b/src/proto/chatwidget.ui
@@ -24,36 +24,6 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <layout class="QHBoxLayout" name="hLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetMinimumSize</enum>
-     </property>
-     <item>
-      <layout class="QHBoxLayout" name="extraButtonsLayout"/>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QToolButton" name="toolButton">
-       <property name="text">
-        <string>...</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="0" column="0" rowspan="4" colspan="2">
     <layout class="QHBoxLayout" name="consoleLayout">
      <property name="sizeConstraint">
@@ -61,6 +31,37 @@
      </property>
     </layout>
    </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QFrame" name="buttonContainer">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QHBoxLayout" name="hLayout">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetMinimumSize</enum>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="extraButtonsLayout"/>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/proto/ficsprotocol.cpp b/src/proto/ficsprotocol.cpp
index 962bbc7..68277aa 100644
--- a/src/proto/ficsprotocol.cpp
+++ b/src/proto/ficsprotocol.cpp
@@ -408,6 +408,7 @@ void FicsProtocol::parseLine(const QString& line)
                 }
                 
                 m_stage = PlayStage;
+                console()->setExtraButtonsShown ( false );
                 initComplete();
             }
             break;

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