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

List:       kde-commits
Subject:    =?utf-8?q?=5Bmarble=5D_src/lib/routing=3A_Show_description_and_s?=
From:       Dennis_Nienhüser <earthwings () gentoo ! org>
Date:       2011-05-11 20:31:24
Message-ID: 20110511203124.B7D6DA60EC () git ! kde ! org
[Download RAW message or body]

Git commit e48aa50a36271b30a68d3df5a3d962108b7c0a7c by Dennis Nienhüser.
Committed on 11/05/2011 at 22:03.
Pushed by nienhueser into branch 'master'.

Show description and status message to the user

M  +2    -0    src/lib/routing/RoutingProfileSettingsDialog.cpp     
M  +24   -1    src/lib/routing/RoutingProfileSettingsDialog.ui     

http://commits.kde.org/marble/e48aa50a36271b30a68d3df5a3d962108b7c0a7c

diff --git a/src/lib/routing/RoutingProfileSettingsDialog.cpp \
b/src/lib/routing/RoutingProfileSettingsDialog.cpp index ebe6ad6..f9a2c34 100644
--- a/src/lib/routing/RoutingProfileSettingsDialog.cpp
+++ b/src/lib/routing/RoutingProfileSettingsDialog.cpp
@@ -85,6 +85,8 @@ void RoutingProfileSettingsDialog::updateConfigWidget( )
     if ( configWidget ) {
         bool const smallScreen = MarbleGlobal::getInstance()->profiles() & \
                MarbleGlobal::SmallScreen;
         m_ui->settingsStack->setCurrentWidget( smallScreen ? m_ui->configurePage : \
configWidget ); +        m_ui->descriptionLabel->setText( plugin->description() );
+        m_ui->statusLabel->setText( plugin->statusMessage() );
         QStandardItem *item = m_servicesModel->invisibleRootItem()->child( \
                current.row() );
         m_ui->settingsStack->setEnabled( item->checkState() == Qt::Checked );
     } else {
diff --git a/src/lib/routing/RoutingProfileSettingsDialog.ui \
b/src/lib/routing/RoutingProfileSettingsDialog.ui index 0a6ffe6..37c32bc 100644
--- a/src/lib/routing/RoutingProfileSettingsDialog.ui
+++ b/src/lib/routing/RoutingProfileSettingsDialog.ui
@@ -101,19 +101,42 @@
              <property name="text">
               <string>Select Service to Configure</string>
              </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
           </layout>
          </widget>
          <widget class="QWidget" name="configurePage">
           <layout class="QGridLayout" name="gridLayout_4">
-           <item row="0" column="0">
+           <item row="2" column="1">
             <widget class="QPushButton" name="configureButton">
              <property name="text">
               <string>Configure</string>
              </property>
             </widget>
            </item>
+           <item row="0" column="1">
+            <widget class="QLabel" name="descriptionLabel">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="1">
+            <widget class="QLabel" name="statusLabel">
+             <property name="text">
+              <string/>
+             </property>
+             <property name="wordWrap">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>


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