From 18a8fb3b9e7cd016d8aa57db319f99f017244811 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 11 Feb 2014 20:23:10 +0100
Subject: [PATCH] Well...

---
 src/gui/formsettings.cpp            |   1 -
 src/gui/formsettings.ui             |  23 ++---
 src/gui/formstandardfeeddetails.cpp |  16 ++--
 src/gui/formstandardfeeddetails.h   |   1 -
 src/gui/formstandardfeeddetails.ui  | 129 ++++++++++++++++++----------
 5 files changed, 106 insertions(+), 64 deletions(-)

diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index 0d1d0851d..3bf7576ac 100755
--- a/src/gui/formsettings.cpp
+++ b/src/gui/formsettings.cpp
@@ -445,7 +445,6 @@ void FormSettings::loadDataStorage() {
   onMysqlUsernameChanged(QString());
   onMysqlPasswordChanged(QString());
 
-  m_ui->m_lblMysqlTestResult->setLayoutDirection(Qt::RightToLeft);
   m_ui->m_lblMysqlTestResult->setStatus(WidgetWithStatus::Information,
                                         tr("No connection test triggered so far."));
 
diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index 938a91966..e582dbb61 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -230,6 +230,9 @@ Authors of this application are NOT responsible for lost data.</string>
                  <verstretch>0</verstretch>
                 </sizepolicy>
                </property>
+               <property name="layoutDirection">
+                <enum>Qt::RightToLeft</enum>
+               </property>
               </widget>
              </item>
             </layout>
@@ -283,8 +286,8 @@ Authors of this application are NOT responsible for lost data.</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>564</width>
-            <height>363</height>
+            <width>100</width>
+            <height>30</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -361,8 +364,8 @@ Authors of this application are NOT responsible for lost data.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>558</width>
-                <height>337</height>
+                <width>209</width>
+                <height>245</height>
                </rect>
               </property>
               <layout class="QFormLayout" name="formLayout">
@@ -1109,12 +1112,6 @@ Authors of this application are NOT responsible for lost data.</string>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>DynamicShortcutsWidget</class>
-   <extends>QWidget</extends>
-   <header>dynamicshortcutswidget.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LineEditWithStatus</class>
    <extends>QWidget</extends>
@@ -1127,6 +1124,12 @@ Authors of this application are NOT responsible for lost data.</string>
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>DynamicShortcutsWidget</class>
+   <extends>QWidget</extends>
+   <header>dynamicshortcutswidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>
diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp
index a7209d978..ffcf51f7b 100644
--- a/src/gui/formstandardfeeddetails.cpp
+++ b/src/gui/formstandardfeeddetails.cpp
@@ -250,14 +250,18 @@ void FormStandardFeedDetails::guessFeed() {
   if (result.first != NULL) {
     // Icon was perhaps guessed.
     m_ui->m_btnIcon->setIcon(result.first->icon());
-
     m_ui->m_txtTitle->lineEdit()->setText(result.first->title());
     m_ui->m_txtDescription->lineEdit()->setText(result.first->description());
     m_ui->m_cmbType->setCurrentIndex(m_ui->m_cmbType->findData(QVariant::fromValue((int) result.first->type())));
     m_ui->m_cmbEncoding->setCurrentIndex(m_ui->m_cmbEncoding->findData(result.first->encoding(), Qt::DisplayRole));
+
+    m_ui->m_lblFetchMetadata->setStatus(WidgetWithStatus::Ok,
+                                        tr("Feed metadata fetched successfully."));
   }
   else {
     // No feed guessed, even no icon available.
+    m_ui->m_lblFetchMetadata->setStatus(WidgetWithStatus::Error,
+                                        tr("Error occurred."));
   }
 }
 
@@ -279,7 +283,7 @@ void FormStandardFeedDetails::createConnections() {
           this, SLOT(onAuthenticationSwitched()));
   connect(m_ui->m_cmbAutoUpdateType, SIGNAL(currentIndexChanged(int)),
           this, SLOT(onAutoUpdateTypeChanged(int)));
-  connect(m_btnLoadDataFromInternet, SIGNAL(clicked()),
+  connect(m_ui->m_btnFetchMetadata, SIGNAL(clicked()),
           this, SLOT(guessFeed()));
 
   // Icon connections.
@@ -309,10 +313,6 @@ void FormStandardFeedDetails::initialize() {
   m_ui = new Ui::FormStandardFeedDetails();
   m_ui->setupUi(this);
 
-  // Add button for fetching feed data from internet.
-  m_btnLoadDataFromInternet = m_ui->m_buttonBox->addButton(tr("Fetch feed metadata"),
-                                                           QDialogButtonBox::HelpRole);
-
   // Set flags and attributes.
   setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog);
   setWindowIcon(IconThemeFactory::instance()->fromTheme("item-new"));
@@ -374,6 +374,10 @@ void FormStandardFeedDetails::initialize() {
   m_iconMenu->addAction(m_actionNoIcon);
   m_ui->m_btnIcon->setMenu(m_iconMenu);
 
+  // Set feed metadata fetch label.
+  m_ui->m_lblFetchMetadata->setStatus(WidgetWithStatus::Information,
+                                      tr("No metadata fetched so far."));
+
   // Setup auto-update options.
   m_ui->m_spinAutoUpdateInterval->setValue(DEFAULT_AUTO_UPDATE_INTERVAL);
   m_ui->m_cmbAutoUpdateType->addItem(tr("Do not auto-update at all"), QVariant::fromValue((int) FeedsModelStandardFeed::DontAutoUpdate));
diff --git a/src/gui/formstandardfeeddetails.h b/src/gui/formstandardfeeddetails.h
index 53700e607..67b6c006d 100644
--- a/src/gui/formstandardfeeddetails.h
+++ b/src/gui/formstandardfeeddetails.h
@@ -72,7 +72,6 @@ class FormStandardFeedDetails : public QDialog {
     QAction *m_actionLoadIconFromFile;
     QAction *m_actionUseDefaultIcon;
     QAction *m_actionNoIcon;
-    QPushButton *m_btnLoadDataFromInternet;
 };
 
 #endif // FORMSTANDARDFEEDDETAILS_H
diff --git a/src/gui/formstandardfeeddetails.ui b/src/gui/formstandardfeeddetails.ui
index 21155981a..980103b88 100644
--- a/src/gui/formstandardfeeddetails.ui
+++ b/src/gui/formstandardfeeddetails.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>440</width>
-    <height>391</height>
+    <width>492</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -57,56 +57,27 @@
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLabel" name="m_lblTitle">
-       <property name="text">
-        <string>Title</string>
-       </property>
-       <property name="buddy">
-        <cstring>m_txtTitle</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="LineEditWithStatus" name="m_txtTitle" native="true"/>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="m_lblDescription">
-       <property name="text">
-        <string>Description</string>
-       </property>
-       <property name="buddy">
-        <cstring>m_txtDescription</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="LineEditWithStatus" name="m_txtDescription" native="true"/>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>URL</string>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <widget class="LineEditWithStatus" name="m_txtUrl" native="true"/>
-     </item>
-     <item row="5" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Encoding</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="2" column="1">
       <widget class="QComboBox" name="m_cmbEncoding">
        <property name="toolTip">
         <string>Select encoding of the standard feed. If you are unsure about the encoding, then select &quot;UTF-8&quot; encoding.</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Auto-update</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
         <widget class="QComboBox" name="m_cmbAutoUpdateType">
@@ -142,7 +113,67 @@
        </item>
       </layout>
      </item>
-     <item row="7" column="0">
+     <item row="4" column="0">
+      <widget class="QLabel" name="m_lblTitle">
+       <property name="text">
+        <string>Title</string>
+       </property>
+       <property name="buddy">
+        <cstring>m_txtTitle</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="LineEditWithStatus" name="m_txtTitle" native="true"/>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="m_lblDescription">
+       <property name="text">
+        <string>Description</string>
+       </property>
+       <property name="buddy">
+        <cstring>m_txtDescription</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="LineEditWithStatus" name="m_txtDescription" native="true"/>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>URL</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="LineEditWithStatus" name="m_txtUrl" native="true"/>
+     </item>
+     <item row="7" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QPushButton" name="m_btnFetchMetadata">
+         <property name="text">
+          <string>Fetch it now</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="LabelWithStatus" name="m_lblFetchMetadata" native="true">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="layoutDirection">
+          <enum>Qt::RightToLeft</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="8" column="0">
       <widget class="QLabel" name="m_lblIcon">
        <property name="text">
         <string>Icon</string>
@@ -152,7 +183,7 @@
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
+     <item row="8" column="1">
       <widget class="QToolButton" name="m_btnIcon">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -189,7 +220,7 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="0" colspan="2">
+     <item row="9" column="0" colspan="2">
       <widget class="QGroupBox" name="m_gbAuthentication">
        <property name="toolTip">
         <string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string>
@@ -236,10 +267,10 @@
        </layout>
       </widget>
      </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_6">
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_7">
        <property name="text">
-        <string>Auto-update</string>
+        <string>Fetch metadata</string>
        </property>
       </widget>
      </item>
@@ -267,6 +298,12 @@
    <header>lineeditwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LabelWithStatus</class>
+   <extends>QWidget</extends>
+   <header>labelwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>