[uim] r6348 committed - * qt4/immodule/candidatewindow.cpp...

[codesite-noreply]

Revision: 6348
Author: nogu.dev
Date: Wed Apr 28 15:51:07 2010
Log: * qt4/immodule/candidatewindow.cpp
  - (CandidateWindow::slotHookSubwindow):
    Follow change of SubWindow::hookPopup().
* qt4/immodule/subwindow.cpp
  - (SubWindow::SubWindow, SubWindow::hookPopup): Remove m_titleLabel.
* qt4/immodule/subwindow.h
  - Ditto.
http://code.google.com/p/uim/source/detail?r=6348

Modified:
 /trunk/qt4/immodule/candidatewindow.cpp
 /trunk/qt4/immodule/subwindow.cpp
 /trunk/qt4/immodule/subwindow.h

=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp     Wed Apr 28 15:50:55 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp     Wed Apr 28 15:51:07 2010
@@ -563,7 +563,7 @@
     if ( !annotationString.isEmpty() )
     {
         subWin->layoutWindow( frameGeometry() );
-        subWin->hookPopup( "Annotation", annotationString );
+        subWin->hookPopup( annotationString );
     }
 }

=======================================
--- /trunk/qt4/immodule/subwindow.cpp   Wed Apr 28 15:50:55 2010
+++ /trunk/qt4/immodule/subwindow.cpp   Wed Apr 28 15:51:07 2010
@@ -36,7 +36,6 @@
 #include <QtCore/QRect>
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
-#include <QtGui/QLabel>
 #include <QtGui/QTextBrowser>
 #include <QtGui/QVBoxLayout>

@@ -55,13 +54,6 @@
 SubWindow::SubWindow( QWidget *parent )
         : QFrame( parent, subwindowFlag )
 {
-    m_titleLabel = new QLabel( this );
-    m_titleLabel->setAlignment( Qt::AlignHCenter );
-    QPalette palette;
-    palette.setColor( m_titleLabel->backgroundRole(), Qt::darkGray );
-    palette.setColor( m_titleLabel->foregroundRole(), Qt::white );
-    m_titleLabel->setPalette( palette );
-
     m_contentsEdit = new QTextBrowser( this );

     m_hookTimer = new QTimer( this );
@@ -69,7 +61,6 @@

     QVBoxLayout *layout = new QVBoxLayout;
     layout->setMargin( 0 );
-    layout->addWidget( m_titleLabel );
     layout->addWidget( m_contentsEdit );
     setLayout( layout );

@@ -79,13 +70,12 @@
 SubWindow::~SubWindow()
 {}

-void SubWindow::hookPopup( const QString &title, const QString contents )
+void SubWindow::hookPopup( const QString contents )
 {
     // stop now running timer
     if ( m_hookTimer->isActive() )
         m_hookTimer->stop();

-    m_titleLabel->setText( title );
     m_contentsEdit->setText( contents );

     m_hookTimer->setSingleShot( true );
=======================================
--- /trunk/qt4/immodule/subwindow.h     Wed Apr 28 15:50:55 2010
+++ /trunk/qt4/immodule/subwindow.h     Wed Apr 28 15:51:07 2010
@@ -36,7 +36,6 @@
 #include <QtCore/QTimer>
 #include <QtGui/QFrame>

-class QLabel;
 class QTextBrowser;

 class SubWindow : public QFrame
@@ -55,7 +54,7 @@
     }

 public slots:
-    void hookPopup( const QString &title, const QString contents );
+    void hookPopup( const QString contents );
     void cancelHook();

 protected:
@@ -65,7 +64,6 @@
     void timerDone();

 protected:
-    QLabel *m_titleLabel;
     QTextBrowser *m_contentsEdit;

     QTimer *m_hookTimer;