[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Konversation] 58619d1: fixuifiles, style guide fixes, typo fixes,
From: Stephan Binner <binner () kde ! org>
Date: 2010-07-01 13:27:32
Message-ID: 20100701132732.77002BB5635 () projects ! kde ! org
[Download RAW message or body]
commit 58619d1a647334b06608ea0f9b91f1428fe15025
Author: Stephan Binner <binner@kde.org>
Date: Wed Jun 16 19:00:16 2004 +0000
fixuifiles, style guide fixes, typo fixes, consistency fixes
svn path=/trunk/kdeextragear-2/konversation/; revision=321262
diff --git a/konversation/dccresumedialog.cpp b/konversation/dccresumedialog.cpp
index 135a925..773307e 100644
--- a/konversation/dccresumedialog.cpp
+++ b/konversation/dccresumedialog.cpp
@@ -56,7 +56,7 @@ DccResumeDialog::DccResumeDialog(QWidget* parent,QString \
filename,const KURL& ne nameInput=new KLineEdit(nameBox,"rename_input");
nameInput->setText(newFilename);
- QPushButton* suggestButton=new QPushButton(i18n("Suggest new \
name"),nameBox,"suggest_name_button"); + QPushButton* suggestButton=new \
QPushButton(i18n("Suggest New Name"),nameBox,"suggest_name_button");
connect(nameInput,SIGNAL (textChanged(const QString&)),this,SLOT \
(filenameChanged(const QString&)) ); connect(suggestButton,SIGNAL \
(clicked()),this,SLOT (suggestNewName()) );
diff --git a/konversation/editserverdialog.cpp b/konversation/editserverdialog.cpp
index 9f7bf00..fbe215c 100644
--- a/konversation/editserverdialog.cpp
+++ b/konversation/editserverdialog.cpp
@@ -125,7 +125,7 @@ EditServerDialog::EditServerDialog(QWidget* parent,
QLabel* connectCommandsLabel = new QLabel(i18n("C&onnect command(s):"), page);
QString connectCommandsWT = i18n("Enter the command(s) you want to execute on "
- "connection to the \
server (separated by semicolons.)"); + \
"connection to the server (separated by semicolons)."); \
QWhatsThis::add(connectCommandsLabel, connectCommandsWT); connectCommandsInput = new \
KLineEdit(connectCommands, page); QWhatsThis::add(connectCommandsInput, \
connectCommandsWT);
diff --git a/konversation/irccolorchooserui.ui b/konversation/irccolorchooserui.ui
index c8521fb..da037d1 100644
--- a/konversation/irccolorchooserui.ui
+++ b/konversation/irccolorchooserui.ui
@@ -12,9 +12,6 @@
<height>108</height>
</rect>
</property>
- <property name="caption">
- <string>IRCColorChooserUI</string>
- </property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
diff --git a/konversation/ircview.cpp b/konversation/ircview.cpp
index 098d172..6759bde 100644
--- a/konversation/ircview.cpp
+++ b/konversation/ircview.cpp
@@ -39,6 +39,7 @@
#include <kstandarddirs.h>
#include <krun.h>
#include <kprocess.h>
+#include <kiconloader.h>
#ifndef KDE_MAKE_VERSION
#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
@@ -71,10 +72,10 @@ IRCView::IRCView(QWidget* parent,Server* newServer) : \
KTextBrowser(parent)
if(popup)
{
- popup->insertItem(i18n("&Copy"),Copy);
+ popup->insertItem(SmallIcon("editcopy"),i18n("&Copy"),Copy);
popup->insertItem(i18n("Select All"),SelectAll);
popup->insertSeparator();
- popup->insertItem(i18n("Search Text..."),Search);
+ popup->insertItem(SmallIcon("find"),i18n("Find Text..."),Search);
popup->insertSeparator();
popup->insertItem(i18n("Send File..."),SendFile);
}
@@ -361,7 +362,7 @@ QString IRCView::filter(const QString& line,const QString& \
defaultColor,const QS
KonversationApplication *konvApp=static_cast<KonversationApplication \
*>(KApplication::kApplication()); konvApp->storeUrl(whoSent,href);
}
-
+
// Hilight
if(doHilight && whoSent!=server->getNickname())
@@ -407,7 +408,7 @@ QString IRCView::filter(const QString& line,const QString& \
defaultColor,const QS {
bool patternFound=0;
Highlight* hilight=hilightList.at(index);
-
+
if(hilight->getRegExp())
{
QRegExp needle(hilight->getPattern().lower());
@@ -424,7 +425,7 @@ QString IRCView::filter(const QString& line,const QString& \
defaultColor,const QS if(patternFound)
{
highlightColor=hilightList.at(index)->getColor().name();
-
+
if(KonversationApplication::preferences.getHilightSoundEnabled()) {
KonversationApplication *konvApp=static_cast<KonversationApplication \
*>(KApplication::kApplication());
konvApp->sound()->play(hilightList.at(index)->getSoundURL());
diff --git a/konversation/konversationmainwindow.cpp \
b/konversation/konversationmainwindow.cpp index e3f3bc2..d0d77a3 100644
--- a/konversation/konversationmainwindow.cpp
+++ b/konversation/konversationmainwindow.cpp
@@ -116,7 +116,7 @@ KonversationMainWindow::KonversationMainWindow() : KMainWindow()
new KAction(i18n("Next Tab"), \
"next",KShortcut("Alt+Right"),this,SLOT(nextTab()),actionCollection(),"next_tab"); \
new KAction(i18n("Previous Tab"), "previous",KShortcut("Alt+Left"), \
this,SLOT(previousTab()),actionCollection(),"previous_tab");
- new KAction(i18n("Close \
Tab"),"fileclose",KShortcut("Ctrl+w"),this,SLOT(closeTab()),actionCollection(),"close_tab");
+ new KAction(i18n("Close \
Tab"),"tab_remove",KShortcut("Ctrl+w"),this,SLOT(closeTab()),actionCollection(),"close_tab");
new TabAction(i18n("Go to Tab Number %1").arg( \
1),0,KShortcut("Alt+1"),this,SLOT(goToTab(int)),actionCollection(),"go_to_tab_1"); \
new TabAction(i18n("Go to Tab Number %1").arg( \
2),1,KShortcut("Alt+2"),this,SLOT(goToTab(int)),actionCollection(),"go_to_tab_2"); \
new TabAction(i18n("Go to Tab Number %1").arg( \
3),2,KShortcut("Alt+3"),this,SLOT(goToTab(int)),actionCollection(),"go_to_tab_3"); @@ \
-298,9 +298,9 @@ void KonversationMainWindow::closeView(QWidget* viewToClose) {
// if this view was the front view, delete the pointer
if(view==frontView) frontView=0;
-
+
emit endNotification(viewToClose);
-
+
ChatWindow::WindowType viewType=view->getType();
QString viewName=view->getName();
@@ -789,9 +789,9 @@ void KonversationMainWindow::insertRememberLine()
{
int total = getViewContainer()->count()-1;
ChatWindow* nextPage;
-
+
for(int i = 0; i <= total; ++i)
- {
+ {
nextPage = static_cast<ChatWindow*>(getViewContainer()->page(i));
if(nextPage->getType() == ChatWindow::Channel ||
nextPage->getType() == ChatWindow::Query)
@@ -800,7 +800,7 @@ void KonversationMainWindow::insertRememberLine()
}
}
}
-
+
else
{
if(frontView->getType() == ChatWindow::Channel ||
@@ -883,14 +883,14 @@ void KonversationMainWindow::closeEvent(QCloseEvent* e)
{
KonversationApplication* \
konv_app=static_cast<KonversationApplication*>(KApplication::kApplication()); if ( \
konv_app->sessionSaving() ) m_closeApp = true;
-
+
if(KonversationApplication::preferences.getShowTrayIcon() && !m_closeApp) {
// Message copied from kopete...
KMessageBox::information(this,
i18n( "<qt>Closing the main window will keep Konversation running in the "
"system tray. Use 'Quit' from the 'File' menu to quit the application.</qt>" \
), i18n( "Docking in System Tray" ), "hideOnCloseInfo");
-
+
hide();
e->ignore();
} else {
diff --git a/konversation/ledtabbar.cpp b/konversation/ledtabbar.cpp
index 362078d..096fc2c 100644
--- a/konversation/ledtabbar.cpp
+++ b/konversation/ledtabbar.cpp
@@ -21,6 +21,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kpopupmenu.h>
+#include <kiconloader.h>
#include "ledtabbar.h"
#include "ledtab.h"
@@ -80,7 +81,7 @@ LedTabBar::LedTabBar(QWidget* parent,const char* name) :
popup->insertSeparator();
popup->insertItem(i18n("Enable Notifications"), EnableNotifications);
popup->insertSeparator();
- popup->insertItem(i18n("Close Tab"),CloseTab);
+ popup->insertItem(SmallIcon("tab_remove"),i18n("Close Tab"),CloseTab);
}
else kdWarning() << "LedTabBar::LedTabBar(): Could not create popup!" << endl;
}
@@ -126,7 +127,7 @@ void LedTabBar::paint( QPainter * p, QTab * t, bool selected ) \
const
iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4;
ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
}
-
+
// do we want close widgets on the tabs?
if(KonversationApplication::preferences.getCloseButtonsOnTabs())
{
@@ -352,7 +353,7 @@ void LedTabBar::contextMenuEvent(QContextMenuEvent* ce)
{
popup->changeTitle(Label,lookTab->text());
ChatWindow* win = \
dynamic_cast<ChatWindow*>(static_cast<LedTab*>(lookTab)->getWidget());
-
+
if(win) {
ChatWindow::WindowType viewType = win->getType();
if(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || \
viewType == ChatWindow::Status) { @@ -364,7 +365,7 @@ void \
LedTabBar::contextMenuEvent(QContextMenuEvent* ce) } else {
popup->setItemVisible(EnableNotifications, false);
}
-
+
int r=popup->exec(ce->globalPos());
if(r==CloseTab)
{
diff --git a/konversation/prefsdialog.cpp b/konversation/prefsdialog.cpp
index b19ce45..590bc53 100644
--- a/konversation/prefsdialog.cpp
+++ b/konversation/prefsdialog.cpp
@@ -45,7 +45,7 @@ PrefsDialog::PrefsDialog(Preferences* preferences,bool noServer) :
QFrame* nickCompletionPane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("Nickname \
Completion")));
notifyPane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("Nick Watch List"))); QFrame* \
highlightPane =addPage(QStringList::split(',',i18n("Chat")+","+i18n("Highlight \
List")));
- QFrame* OSDPane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("OnScreen Display"))); + \
QFrame* OSDPane =addPage(QStringList::split(',',i18n("Chat")+","+i18n("On \
Screen Display"))); QFrame* ignorePane \
=addPage(QStringList::split(',',i18n("Chat")+","+i18n("Ignore List"))); QFrame* \
aliasesPane =addPage(QStringList::split(',',i18n("Chat")+","+i18n("Aliases")));
diff --git a/konversation/prefspagegeneralsettings.cpp \
b/konversation/prefspagegeneralsettings.cpp index 9765b99..6970f57 100644
--- a/konversation/prefspagegeneralsettings.cpp
+++ b/konversation/prefspagegeneralsettings.cpp
@@ -41,7 +41,7 @@ PrefsPageGeneralSettings::PrefsPageGeneralSettings(QFrame* \
newParent,Preferences commandCharInput->setMaxLength(1);
commandCharLabel->setBuddy(commandCharInput);
- QLabel* ctcpVersionLabel=new QLabel(i18n("Custom &Version \
Reply:"),commandCharBox); + QLabel* ctcpVersionLabel=new QLabel(i18n("Custom \
&version reply:"),commandCharBox); ctcpVersionInput=new \
KLineEdit(preferences->getVersionReply(),commandCharBox); \
ctcpVersionLabel->setBuddy(ctcpVersionInput); QString msg = i18n("<qt>Here you can \
set a custom reply for <b>CTCP <i>VERSION</i></b> requests.</qt>");
diff --git a/konversation/prefspageidentity.cpp b/konversation/prefspageidentity.cpp
index 0a49605..21a6cc5 100644
--- a/konversation/prefspageidentity.cpp
+++ b/konversation/prefspageidentity.cpp
@@ -119,7 +119,7 @@ PrefsPageIdentity::PrefsPageIdentity(QFrame* \
newParent,Preferences* newPreferenc unAwayLabel=new QLabel(i18n("Re&turn \
message:"),parentFrame); unAwayInput=new KLineEdit(parentFrame);
unAwayLabel->setBuddy(unAwayInput);
-
+
QLabel* awayNickLabel = new QLabel(i18n("Away nickname:"), parentFrame);
awayNickInput = new KLineEdit(parentFrame);
awayNickLabel->setBuddy(awayNickInput);
@@ -220,7 +220,7 @@ PrefsPageIdentity::PrefsPageIdentity(QFrame* \
newParent,Preferences* newPreferenc connect(showAwayMessageCheck,SIGNAL \
(stateChanged(int)),this,SLOT (showAwayMessageChanged(int)) ); \
connect(awayInput,SIGNAL (textChanged(const QString&)),this,SLOT \
(awayMessageChanged(const QString&)) ); connect(unAwayInput,SIGNAL \
(textChanged(const QString&)),this,SLOT (unAwayMessageChanged(const \
QString&)) );
-
+
connect(awayNickInput, SIGNAL(textChanged(const QString&)), this, \
SLOT(awayNickChanged(const QString&)));
connect(addIdentityButton,SIGNAL (clicked()),this,SLOT(addIdentity()) );
@@ -330,9 +330,9 @@ void PrefsPageIdentity::updateIdentity(int number)
realNameInput->setText(identity->getRealName());
// find encoding and set combo box accordingly
-
+
QRegExp encoding("\\b"+identity->getCodec().lower()+"\\b");
-
+
for(unsigned int index=0;index<encodings.count();index++)
{
if(encoding.search(encodings[index].lower())!=-1)
@@ -357,7 +357,7 @@ void PrefsPageIdentity::updateIdentity(int number)
showAwayMessageCheck->setChecked(identity->getShowAwayMessage());
awayInput->setText(identity->getAwayMessage());
unAwayInput->setText(identity->getReturnMessage());
-
+
awayNickInput->setText(identity->getAwayNick());
updateAwayWidgets(identity->getShowAwayMessage());
@@ -395,11 +395,10 @@ void PrefsPageIdentity::addIdentity()
void PrefsPageIdentity::removeIdentity()
{
- if(KMessageBox::warningYesNo(parentFrame,
+ if(KMessageBox::warningContinueCancel(parentFrame,
i18n("Are you sure you want to delete all information \
for this identity?"), i18n("Delete Identity"),
- KStdGuiItem::yes(),
- KStdGuiItem::no())==KMessageBox::Yes)
+ \
KGuiItem(i18n("Delete"),"editdelete"))==KMessageBox::Continue) {
// TODO: are you sure here
int current=identityCombo->currentItem();
diff --git a/konversation/prefspageirccolorsui.ui \
b/konversation/prefspageirccolorsui.ui index e729020..f147ed2 100644
--- a/konversation/prefspageirccolorsui.ui
+++ b/konversation/prefspageirccolorsui.ui
@@ -8,13 +8,10 @@
<rect>
<x>0</x>
<y>0</y>
- <width>329</width>
+ <width>425</width>
<height>297</height>
</rect>
</property>
- <property name="caption">
- <string>PrefsPageIRCColorsUI</string>
- </property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
@@ -89,7 +86,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Dar&k Gray:</string>
+ <string>Dar&k gray:</string>
</property>
<property name="buddy" stdset="0">
<cstring>m_grayCBtn</cstring>
diff --git a/konversation/prefspagenickcompletion.cpp \
b/konversation/prefspagenickcompletion.cpp index 7b5a499..406d4e2 100644
--- a/konversation/prefspagenickcompletion.cpp
+++ b/konversation/prefspagenickcompletion.cpp
@@ -36,7 +36,7 @@ PrefsPageNickCompletion::PrefsPageNickCompletion(QFrame* newParent, \
Preferences* completionModeCBox = new QComboBox(parentFrame);
completionModeCBox->insertItem(i18n("Cycle Nicklist"));
completionModeCBox->insertItem(i18n("Shell-Like"));
- completionModeCBox->insertItem(i18n("Shell-Like With Completion Box"));
+ completionModeCBox->insertItem(i18n("Shell-Like with Completion Box"));
completionModeCBox->setCurrentItem(preferences->getNickCompletionMode());
modeLbl->setBuddy(completionModeCBox);
diff --git a/konversation/prefspageosd.cpp b/konversation/prefspageosd.cpp
index 502b0e5..580e8ca 100644
--- a/konversation/prefspageosd.cpp
+++ b/konversation/prefspageosd.cpp
@@ -45,7 +45,7 @@ PrefsPageOSD::PrefsPageOSD(QFrame* newParent,Preferences* \
newPreferences) : QHBox* osdBox = new QHBox(parentFrame);
osdBox->setSpacing(spacingHint());
- useOSDCheck = new QCheckBox(i18n("&Use OnScreen Display"), osdBox, \
"use_osd_checkbox"); + useOSDCheck = new QCheckBox(i18n("&Use On Screen Display"), \
osdBox, "use_osd_checkbox");
// Set up osd widgets
@@ -69,7 +69,7 @@ PrefsPageOSD::PrefsPageOSD(QFrame* newParent,Preferences* \
newPreferences) : osdFontButton = new QPushButton(i18n("C&hoose..."), parentFrame, \
"osd_font_button"); connect(osdFontButton, SIGNAL(clicked()), this, \
SLOT(osdFontClicked()));
- drawShadowsCheck = new QCheckBox(i18n("&Draw Shadows"), parentFrame, \
"draw_shadows_checkbox"); + drawShadowsCheck = new QCheckBox(i18n("&Draw shadows"), \
parentFrame, "draw_shadows_checkbox"); \
drawShadowsCheck->setChecked(preferences->getOSDDrawShadow());
//color box
@@ -78,13 +78,13 @@ PrefsPageOSD::PrefsPageOSD(QFrame* newParent,Preferences* \
newPreferences) : useCustomColorsCheck->setChecked(preferences->getOSDUseCustomColors());
QHBox *osdTextColorBox = new QHBox(osdColorsBox);
- osdTextColorLabel = new QLabel(i18n("Text Co&lor:"), osdTextColorBox);
+ osdTextColorLabel = new QLabel(i18n("Text co&lor:"), osdTextColorBox);
osdTextColorChooser = new KColorCombo(osdTextColorBox, "osd_text_color");
osdTextColorChooser->setColor(preferences->getOSDTextColor());
osdTextColorLabel->setBuddy(osdTextColorChooser);
QHBox *osdBackgroundColorBox = new QHBox(osdColorsBox);
- osdBackgroundColorLabel = new QLabel(i18n("&Background Color:"), \
osdBackgroundColorBox); + osdBackgroundColorLabel = new QLabel(i18n("&Background \
color:"), osdBackgroundColorBox); osdBackgroundColorChooser = new \
KColorCombo(osdBackgroundColorBox, "osd_background_color"); \
osdBackgroundColorChooser->setColor(preferences->getOSDBackgroundColor()); \
osdBackgroundColorLabel->setBuddy(osdBackgroundColorChooser);
diff --git a/konversation/prefspagewebbrowser.cpp \
b/konversation/prefspagewebbrowser.cpp index 103f2c5..f210ea4 100644
--- a/konversation/prefspagewebbrowser.cpp
+++ b/konversation/prefspagewebbrowser.cpp
@@ -28,7 +28,7 @@ PrefsPageWebBrowser::PrefsPageWebBrowser(QFrame* \
newParent,Preferences* newPrefe QGridLayout* wbLayout=new \
QGridLayout(parentFrame,1,1,marginHint(),spacingHint(),"wb_settings_layout");
// Set up web browser widgets
- QVButtonGroup* wbActionsBox = new QVButtonGroup(i18n("When URL Is Clicked"), \
parentFrame, "wb_actions_group"); + QVButtonGroup* wbActionsBox = new \
QVButtonGroup(i18n("When URL is Clicked"), parentFrame, "wb_actions_group"); \
wbActionsBox->setRadioButtonExclusive(true); wbUseKdeDefault = new \
QRadioButton(i18n("Use default KDE web browser"), wbActionsBox, \
"wb_use_kde_default"); QHBox* wbCustomBox = new QHBox(wbActionsBox);
@@ -45,7 +45,7 @@ PrefsPageWebBrowser::PrefsPageWebBrowser(QFrame* \
newParent,Preferences* newPrefe wbActionsBox -> \
setButton(wbActionsBox->id(wbUseCustomCmd)); wbCustomCmd->setEnabled(true);
}
-
+
// Define the layout
// Position radio button group at top of frame, as wide as the frame.
wbLayout->addWidget(wbActionsBox, 0, 0, Qt::AlignTop);
diff --git a/konversation/searchdialog.cpp b/konversation/searchdialog.cpp
index 407eec7..e2b9a05 100644
--- a/konversation/searchdialog.cpp
+++ b/konversation/searchdialog.cpp
@@ -30,20 +30,20 @@ bool SearchDialog::forward=false;
bool SearchDialog::fromCursor=false;
SearchDialog::SearchDialog(QWidget* parent,QSize size) :
- KDialogBase(parent,"search_dialog",true,i18n("Search Text"),
+ KDialogBase(parent,"search_dialog",true,i18n("Find Text"),
KDialogBase::Ok | \
KDialogBase::Cancel,KDialogBase::Ok,true) {
// Create the top level widget
QWidget* page=new QWidget(this);
setMainWidget(page);
-
+
// Add the layout to the widget
QGridLayout* dialogLayout=new QGridLayout(page,2,2);
dialogLayout->setSpacing(spacingHint());
QHBox* searchBox=new QHBox(page);
-
- new QLabel(i18n("Search text:"),searchBox,"search_label");
+
+ new QLabel(i18n("Text to find:"),searchBox,"search_label");
searchPattern=new KComboBox(searchBox);
searchPattern->setEditable(true);
searchPattern->insertStringList(lastSearchPatterns);
@@ -53,10 +53,10 @@ SearchDialog::SearchDialog(QWidget* parent,QSize size) :
caseSensitiveCheck=new QCheckBox(i18n("Case \
sensitive"),page,"case_sensitive_check"); \
caseSensitiveCheck->setChecked(caseSensitive);
-
+
wholeWordsCheck=new QCheckBox(i18n("Whole words"),page,"whole_words_check");
wholeWordsCheck->setChecked(wholeWords);
-
+
forwardCheck=new QCheckBox(i18n("Search forward"),page,"forward_check");
forwardCheck->setChecked(forward);
@@ -64,7 +64,7 @@ SearchDialog::SearchDialog(QWidget* parent,QSize size) :
fromCursorCheck->setChecked(fromCursor);
int row=0;
-
+
dialogLayout->addMultiCellWidget(searchBox,row,0,row,1);
row++;
dialogLayout->addWidget(caseSensitiveCheck,row,0);
@@ -108,14 +108,14 @@ QString SearchDialog::search(QWidget* parent,bool* cs,bool* \
wo,bool* fw,bool* fc fromCursor=true;
dlg.fromCursorCheck->setChecked(fromCursor);
}
-
+
int returnCode=dlg.exec();
-
+
*cs=caseSensitive;
*wo=wholeWords;
*fw=forward;
*fc=fromCursor;
-
+
return (returnCode==Accepted) ? dlg.getSearchText() : QString::null;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic