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

List:       kde-commits
Subject:    [marble/esasocis-2012-eclipse] src/plugins/render/eclipses: EclipsesPlugin: Improve eclipses list di
From:       Rene Kuettner <rene () bitkanal ! net>
Date:       2013-01-17 18:29:09
Message-ID: 20130117182909.5688FA6091 () git ! kde ! org
[Download RAW message or body]

Git commit a7e7c8df568df55e2bf63ddb75e1ec5c155006e3 by Rene Kuettner.
Committed on 17/01/2013 at 18:09.
Pushed by renek into branch 'esasocis-2012-eclipse'.

EclipsesPlugin: Improve eclipses list dialog

M  +0    -2    src/plugins/render/eclipses/EclipsesListDialog.cpp
M  +0    -1    src/plugins/render/eclipses/EclipsesListDialog.h
M  +25   -38   src/plugins/render/eclipses/EclipsesListDialog.ui
M  +0    -2    src/plugins/render/eclipses/EclipsesPlugin.cpp

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

diff --git a/src/plugins/render/eclipses/EclipsesListDialog.cpp \
b/src/plugins/render/eclipses/EclipsesListDialog.cpp index 2b574eb..63513c5 100644
--- a/src/plugins/render/eclipses/EclipsesListDialog.cpp
+++ b/src/plugins/render/eclipses/EclipsesListDialog.cpp
@@ -86,8 +86,6 @@ void EclipsesListDialog::initialize()
              this, SLOT(accept()) );
     connect( m_listWidget->buttonClose, SIGNAL(clicked()),
              this, SLOT(reject()) );
-    connect( m_listWidget->buttonSettings, SIGNAL(clicked()),
-             SIGNAL(buttonSettingsClicked()) );
     connect( m_listWidget->spinBoxYear, SIGNAL(valueChanged(int)),
              this, SLOT(updateEclipsesListForYear(int)) );
     connect( m_listWidget->treeView->selectionModel(),
diff --git a/src/plugins/render/eclipses/EclipsesListDialog.h \
b/src/plugins/render/eclipses/EclipsesListDialog.h index a094908..8a57f39 100644
--- a/src/plugins/render/eclipses/EclipsesListDialog.h
+++ b/src/plugins/render/eclipses/EclipsesListDialog.h
@@ -39,7 +39,6 @@ public:
 
 Q_SIGNALS:
     void buttonShowClicked( int year, int index );
-    void buttonSettingsClicked();
 
 protected Q_SLOTS:
     void accept();
diff --git a/src/plugins/render/eclipses/EclipsesListDialog.ui \
b/src/plugins/render/eclipses/EclipsesListDialog.ui index 5eb7685..5b6cede 100644
--- a/src/plugins/render/eclipses/EclipsesListDialog.ui
+++ b/src/plugins/render/eclipses/EclipsesListDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>555</width>
-    <height>213</height>
+    <width>591</width>
+    <height>183</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -54,7 +54,7 @@
          </font>
         </property>
         <property name="alignment">
-         <set>Qt::AlignCenter</set>
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="buttonSymbols">
          <enum>QAbstractSpinBox::PlusMinus</enum>
@@ -90,9 +90,19 @@
        </spacer>
       </item>
       <item>
-       <widget class="QPushButton" name="buttonSettings">
+       <widget class="QPushButton" name="buttonClose">
+        <property name="text">
+         <string>&amp;Close</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="buttonShow">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
         <property name="text">
-         <string>&amp;Settings...</string>
+         <string>&amp;Go To Selected Eclipse</string>
         </property>
        </widget>
       </item>
@@ -107,11 +117,20 @@
      <property name="headerHidden">
       <bool>false</bool>
      </property>
+     <attribute name="headerCascadingSectionResizes">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="headerDefaultSectionSize">
+      <number>100</number>
+     </attribute>
      <attribute name="headerHighlightSections">
       <bool>false</bool>
      </attribute>
      <attribute name="headerMinimumSectionSize">
-      <number>120</number>
+      <number>100</number>
+     </attribute>
+     <attribute name="headerStretchLastSection">
+      <bool>true</bool>
      </attribute>
     </widget>
    </item>
@@ -124,44 +143,12 @@
       <property name="margin">
        <number>0</number>
       </property>
-      <item>
-       <spacer name="horizontalSpacer2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="buttonClose">
-        <property name="text">
-         <string>&amp;Close</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="buttonShow">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>&amp;Show Selected Eclipse</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>buttonSettings</tabstop>
-  <tabstop>spinBoxYear</tabstop>
   <tabstop>treeView</tabstop>
  </tabstops>
  <resources/>
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp \
b/src/plugins/render/eclipses/EclipsesPlugin.cpp index 4f8291b..8156b00 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.cpp
+++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp
@@ -168,8 +168,6 @@ void EclipsesPlugin::initialize()
     m_configWidget->setupUi( m_configDialog );
 
     m_listDialog = new EclipsesListDialog( marbleModel() );
-    connect( m_listDialog, SIGNAL(buttonSettingsClicked()),
-             m_configDialog, SLOT(show()) );
     connect( m_listDialog, SIGNAL(buttonShowClicked(int, int)),
              this, SLOT(showEclipse(int,int)) );
 


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