[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepimlibs/akonadi
From: Tobias Koenig <tokoe () kde ! org>
Date: 2010-12-30 10:14:14
Message-ID: 20101230101414.9BBECAC8AC () svn ! kde ! org
[Download RAW message or body]
SVN commit 1210266 by tokoe:
Add a 'Quit' button to error overlay
In mobile UI mode there will be a Quit button available
in the error overlay to quit the application. This is
necessary if the server fails to restart and the error overlay
therefor won't vanish.
BUG: 251473
M +11 -0 erroroverlay.cpp
M +8 -1 erroroverlay.ui
M +1 -0 erroroverlay_p.h
--- trunk/KDE/kdepimlibs/akonadi/erroroverlay.cpp #1210265:1210266
@@ -93,8 +93,14 @@
ui->notRunningIcon->setPixmap( KIcon( QLatin1String( "akonadi" ) ).pixmap( 64 ) );
ui->brokenIcon->setPixmap( KIcon( QString::fromLatin1( "dialog-error" ) ).pixmap( \
64 ) ); ui->progressIcon->setPixmap( KIcon( QLatin1String( "akonadi" ) ).pixmap( 32 \
) ); + ui->quitButton->setText( KStandardGuiItem::quit().text() );
+#ifndef KDEPIM_MOBILE_UI
+ ui->quitButton->hide();
+#endif
+
connect( ui->startButton, SIGNAL( clicked() ), SLOT( startClicked() ) );
+ connect( ui->quitButton, SIGNAL( clicked() ), SLOT( quitClicked() ) );
connect( ui->selfTestButton, SIGNAL( clicked() ), SLOT( selfTestClicked() ) );
const ServerManager::State state = ServerManager::state();
@@ -165,6 +171,11 @@
ServerManager::start();
}
+void ErrorOverlay::quitClicked()
+{
+ qApp->quit();
+}
+
void ErrorOverlay::selfTestClicked()
{
SelfTestDialog dlg;
--- trunk/KDE/kdepimlibs/akonadi/erroroverlay.ui #1210265:1210266
@@ -20,7 +20,7 @@
<property name="toolTip">
<string>The Akonadi personal information management service is not running. \
This application cannot be used without it.</string> </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
@@ -73,6 +73,8 @@
</spacer>
</item>
<item>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
<widget class="KPushButton" name="startButton">
<property name="text">
<string comment="@action:button Start the Akonadi server">Start</string>
@@ -80,6 +82,11 @@
</widget>
</item>
<item>
+ <widget class="KPushButton" name="quitButton"/>
+ </item>
+ </layout>
+ </item>
+ <item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
--- trunk/KDE/kdepimlibs/akonadi/erroroverlay_p.h #1210265:1210266
@@ -60,6 +60,7 @@
private slots:
void startClicked();
+ void quitClicked();
void selfTestClicked();
void serverStateChanged( Akonadi::ServerManager::State state );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic