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

List:       kde-commits
Subject:    kdenetwork/kopete/kopete
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-01-29 11:51:52
Message-ID: 20050129115152.947CD1B9AD () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Put the "Search:" label in a different widget so it's removable from the toolbar.
It's now exactly like in Konqueror

BUG: 97258


  M +2 -1      kopeteui.rc   1.41
  M +5 -5      kopetewindow.cpp   1.221


--- kdenetwork/kopete/kopete/kopeteui.rc  #1.40:1.41
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kopete" version="19">
+<kpartgui name="kopete" version="20">
         <MenuBar>
                 <Menu name="file" noMerge="1">
@@ -57,4 +57,5 @@
         <ToolBar fullWidth="true" name="quickSearchBar" noMerge="1"><Text>Quick \
Search Bar</Text>  <Action name="quicksearch_reset"/>
+                <Action name="quicksearch_label"/>
                 <Action name="quicksearch_bar"/>
         </ToolBar>

--- kdenetwork/kopete/kopete/kopetewindow.cpp  #1.220:1.221
@@ -191,11 +191,11 @@ void KopeteWindow::initActions()
 
         // quick search bar
-        QHBox *quickSearchContainer = new QHBox( 0, "kde toolbar widget" );
-        QLabel *searchLabel = new QLabel( i18n("Se&arch:"), quickSearchContainer, \
                "kde toolbar widget" );
-        QWidget *searchBar = new Kopete::UI::ListView::SearchLine( \
quickSearchContainer, contactlist, "quicksearch_bar" ); +        QLabel *searchLabel \
= new QLabel( i18n("Se&arch:"), 0, "kde toolbar widget" ); +        QWidget \
*searchBar = new Kopete::UI::ListView::SearchLine( 0, contactlist, "quicksearch_bar" \
);  searchLabel->setBuddy( searchBar );
-        KWidgetAction *quickSearch = new KWidgetAction( quickSearchContainer, i18n( \
"Quick Search Bar" ), 0, 0, 0, actionCollection(), "quicksearch_bar" ); +        \
KWidgetAction *quickSearch = new KWidgetAction( searchBar, i18n( "Quick Search Bar" \
), 0, 0, 0, actionCollection(), "quicksearch_bar" ); +        new KWidgetAction( \
searchLabel, i18n( "Search:" ), 0, 0, 0, actionCollection(), "quicksearch_label" );  \
                quickSearch->setAutoSized( true );
-        connect( quickSearch, SIGNAL( activated() ), searchBar, SLOT( setFocus() ) \
); +        connect( searchLabel, SIGNAL( activated() ), searchBar, SLOT( setFocus() \
) );  // quick search bar - clear button
         KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),


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