[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [skrooge/Feature] plugins/skrooge/skrooge_unit: Fix brainless copy
From: Guillaume de Bure <guillaume.debure () gmail ! com>
Date: 2011-08-31 21:36:21
Message-ID: 20110831213621.DD648A6078 () git ! kde ! org
[Download RAW message or body]
Git commit f2b90ce1c32560bf0ae486848cad1fb4bf1ba499 by Guillaume de Bure.
Committed on 31/08/2011 at 23:34.
Pushed by gdebure into branch 'Feature'.
Fix brainless copy / paste that prevents the new download button to work as expected
Fix appearance of units edition panel (Manual / Share)
Remove reference to libkdepim that failed on compile
M +245 -243 plugins/skrooge/skrooge_unit/skgunitpluginwidget_base.ui
M +4 -4 plugins/skrooge/skrooge_unit/skgunitpluginwidget.cpp
http://commits.kde.org/skrooge/f2b90ce1c32560bf0ae486848cad1fb4bf1ba499
diff --git a/plugins/skrooge/skrooge_unit/skgunitpluginwidget.cpp \
b/plugins/skrooge/skrooge_unit/skgunitpluginwidget.cpp index b017366..9dd4271 100644
--- a/plugins/skrooge/skrooge_unit/skgunitpluginwidget.cpp
+++ b/plugins/skrooge/skrooge_unit/skgunitpluginwidget.cpp
@@ -105,19 +105,19 @@ SKGUnitPluginWidget::SKGUnitPluginWidget(SKGDocumentBank* \
iDocument)
connect(downloadMonthlyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadMonthlyValues()));
KAction* downloadWeeklyAction = new KAction(KIcon("download"), i18n("download \
all weekly values"), this);
- connect(downloadMonthlyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadWeeklyValues())); + \
connect(downloadWeeklyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadWeeklyValues()));
KAction* downloadDailyAction = new KAction(KIcon("download"), i18n("download all \
daily values"), this);
connect(downloadDailyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadDailyValues()));
KAction* downloadLastMonthlyAction = new KAction(KIcon("download"), \
i18n("download monthly values since last known value"), this);
- connect(downloadMonthlyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadMonthlyValuesFromLast())); + \
connect(downloadLastMonthlyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadMonthlyValuesFromLast()));
KAction* downloadLastWeeklyAction = new KAction(KIcon("download"), \
i18n("download weekly values since last known value"), this);
- connect(downloadMonthlyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadWeeklyValuesFromLast())); + \
connect(downloadLastWeeklyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadWeeklyValuesFromLast()));
KAction* downloadLastDailyAction = new KAction(KIcon("download"), i18n("download \
daily values since last known value"), this);
- connect(downloadDailyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadDailyValuesFromLast())); + \
connect(downloadLastDailyAction, SIGNAL(triggered(Qt::MouseButtons, \
Qt::KeyboardModifiers)), SLOT(downloadDailyValuesFromLast()));
KMenu* downloadMenu = new KMenu();
diff --git a/plugins/skrooge/skrooge_unit/skgunitpluginwidget_base.ui \
b/plugins/skrooge/skrooge_unit/skgunitpluginwidget_base.ui index a408752..cb68749 \
100644
--- a/plugins/skrooge/skrooge_unit/skgunitpluginwidget_base.ui
+++ b/plugins/skrooge/skrooge_unit/skgunitpluginwidget_base.ui
@@ -6,14 +6,11 @@
<rect>
<x>0</x>
<y>0</y>
- <width>769</width>
- <height>446</height>
+ <width>688</width>
+ <height>463</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="spacing">
- <number>2</number>
- </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QSplitter" name="kMainSplitter">
<property name="orientation">
@@ -128,99 +125,242 @@
<number>2</number>
</property>
<item>
- <widget class="QFrame" name="kManualFrm">
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>2</number>
- </property>
- <item row="0" column="1">
- <widget class="KLineEdit" name="kNameCreatorUnit">
- <property name="toolTip">
- <string>The name of the unit.</string>
- </property>
- <property name="statusTip">
- <string>The name of the unit.</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="KLineEdit" name="kSymbolCreatorUnit">
- <property name="toolTip">
- <string>The symbol of the unit.</string>
- </property>
- <property name="statusTip">
- <string>The symbol of the unit.</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" colspan="5">
- <widget class="KLineEdit" name="kCountryCreatorUnit">
- <property name="toolTip">
- <string>The country of the unit.</string>
- </property>
- <property name="statusTip">
- <string>The country of the unit.</string>
- </property>
- </widget>
- </item>
- <item row="0" column="5">
- <widget class="SKGComboBox" name="kTypeCreatorUnit">
- <property name="toolTip">
- <string>The type of the unit.</string>
- </property>
- <property name="statusTip">
- <string>The type of the unit.</string>
- </property>
- <property name="autoCompletion">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="SKGUnitComboBox" name="kUnitCreatorUnit">
- <property name="toolTip">
- <string>The unit of the unit.</string>
- </property>
- <property name="statusTip">
- <string>The unit of the unit.</string>
- </property>
- </widget>
+ <widget class="QWidget" name="kManualFrm" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="kNameLbl">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string notr="true">Name:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>kNameCreatorUnit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="KLineEdit" name="kNameCreatorUnit">
+ <property name="toolTip">
+ <string>The name of the unit.</string>
+ </property>
+ <property name="statusTip">
+ <string>The name of the unit.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="kSymbolLbl">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ <strikeout>false</strikeout>
+ <stylestrategy>PreferDefault</stylestrategy>
+ <kerning>true</kerning>
+ </font>
+ </property>
+ <property name="text">
+ <string notr="true">Symbol</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>kSymbolCreatorUnit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="kSymbolCreatorUnit">
+ <property name="toolTip">
+ <string>The symbol of the unit.</string>
+ </property>
+ <property name="statusTip">
+ <string>The symbol of the unit.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="kTypeLbl">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ <strikeout>false</strikeout>
+ <stylestrategy>PreferDefault</stylestrategy>
+ <kerning>true</kerning>
+ </font>
+ </property>
+ <property name="text">
+ <string notr="true">Type:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>kTypeCreatorUnit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="SKGComboBox" name="kTypeCreatorUnit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>The type of the unit.</string>
+ </property>
+ <property name="statusTip">
+ <string>The type of the unit.</string>
+ </property>
+ <property name="autoCompletion">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="kNbDecimal">
- <property name="toolTip">
- <string>The number of decimal to display of the unit.</string>
- </property>
- <property name="statusTip">
- <string>The number of decimal to display of the unit.</string>
- </property>
- <property name="maximum">
- <number>8</number>
- </property>
- <property name="value">
- <number>2</number>
- </property>
- </widget>
+ <item>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="kDecimalLbl">
+ <property name="text">
+ <string notr="true">Nb Decimals:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>kNbDecimal</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="kNbDecimal">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>The number of decimal to display of the unit.</string>
+ </property>
+ <property name="statusTip">
+ <string>The number of decimal to display of the unit.</string>
+ </property>
+ <property name="maximum">
+ <number>8</number>
+ </property>
+ <property name="value">
+ <number>2</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="kCountyLbl">
+ <property name="font">
+ <font>
+ <weight>50</weight>
+ <bold>false</bold>
+ <strikeout>false</strikeout>
+ <stylestrategy>PreferDefault</stylestrategy>
+ <kerning>true</kerning>
+ </font>
+ </property>
+ <property name="text">
+ <string notr="true">Country:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>kCountryCreatorUnit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="kCountryCreatorUnit">
+ <property name="toolTip">
+ <string>The country of the unit.</string>
+ </property>
+ <property name="statusTip">
+ <string>The country of the unit.</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="kUnitLbl">
+ <property name="text">
+ <string notr="true">Unit:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>kUnitCreatorUnit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="SKGUnitComboBox" name="kUnitCreatorUnit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>The unit of the unit.</string>
+ </property>
+ <property name="statusTip">
+ <string>The unit of the unit.</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="1" column="5">
- <widget class="KLineEdit" name="kInternetCreatorUnit">
- <property name="toolTip">
- <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> + <item>
+ <layout class="QFormLayout" name="formLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="kInternetLbl">
+ <property name="font">
+ <font>
+ <weight>50</weight>
+ <bold>false</bold>
+ <strikeout>false</strikeout>
+ <stylestrategy>PreferDefault</stylestrategy>
+ <kerning>true</kerning>
+ </font>
+ </property>
+ <property name="text">
+ <string notr="true">Internet Code:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="buddy">
+ <cstring>kInternetCreatorUnit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="KLineEdit" name="kInternetCreatorUnit">
+ <property name="toolTip">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> \
<html><head><meta name="qrichtext" content="1" \
/><style type="text/css"> p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'DejaVu Sans'; \
font-size:10pt; font-weight:400; font-style:normal;"> @@ -229,144 +369,13 @@ \
p, li { white-space: pre-wrap; } <p style=" margin-top:0px; \
margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;">You can add " /" if you are not able to download \
the expected quote but you are able to download the inverse.</p> <p \
style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: \
underline;">Example:</span> EURUSD=X is the symbol to download EURO in \
USD.</p> <p style=" margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If \
you want USD in EURO, you have to create a unit USD with "EURUSD=X /" as \
the Internet code</p></body></html></string>
- </property>
- <property name="statusTip">
- <string>The Yahoo Internet code of the unit.</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QLabel" name="kUnitLbl">
- <property name="text">
- <string notr="true">Title:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>kUnitCreatorUnit</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="kNameLbl">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string notr="true">Title:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>kNameCreatorUnit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="kCountyLbl">
- <property name="font">
- <font>
- <weight>50</weight>
- <bold>false</bold>
- <strikeout>false</strikeout>
- <stylestrategy>PreferDefault</stylestrategy>
- <kerning>true</kerning>
- </font>
- </property>
- <property name="text">
- <string notr="true">Title:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>kCountryCreatorUnit</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QLabel" name="kSymbolLbl">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- <strikeout>false</strikeout>
- <stylestrategy>PreferDefault</stylestrategy>
- <kerning>true</kerning>
- </font>
- </property>
- <property name="text">
- <string notr="true">Title:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>kSymbolCreatorUnit</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="4">
- <widget class="QLabel" name="kTypeLbl">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- <strikeout>false</strikeout>
- <stylestrategy>PreferDefault</stylestrategy>
- <kerning>true</kerning>
- </font>
- </property>
- <property name="text">
- <string notr="true">Type:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>kTypeCreatorUnit</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="kDecimalLbl">
- <property name="text">
- <string notr="true">Title:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>kNbDecimal</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
- <widget class="QLabel" name="kInternetLbl">
- <property name="font">
- <font>
- <weight>50</weight>
- <bold>false</bold>
- <strikeout>false</strikeout>
- <stylestrategy>PreferDefault</stylestrategy>
- <kerning>true</kerning>
- </font>
- </property>
- <property name="text">
- <string notr="true">Title:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="buddy">
- <cstring>kInternetCreatorUnit</cstring>
- </property>
- </widget>
+ </property>
+ <property name="statusTip">
+ <string>The Yahoo Internet code of the unit.</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -669,7 +678,7 @@ See options to modify download frequency.</string>
<string>Download</string>
</property>
<property name="popupMode">
- <enum>QToolButton::InstantPopup</enum>
+ <enum>QToolButton::DelayedPopup</enum>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -756,13 +765,6 @@ See options to modify download frequency.</string>
<tabstops>
<tabstop>kUnitTableViewEdition</tabstop>
<tabstop>kUnitValueTableViewEdition</tabstop>
- <tabstop>kNameCreatorUnit</tabstop>
- <tabstop>kSymbolCreatorUnit</tabstop>
- <tabstop>kTypeCreatorUnit</tabstop>
- <tabstop>kNbDecimal</tabstop>
- <tabstop>kUnitCreatorUnit</tabstop>
- <tabstop>kInternetCreatorUnit</tabstop>
- <tabstop>kCountryCreatorUnit</tabstop>
<tabstop>kCurrencyList</tabstop>
<tabstop>kObsolete</tabstop>
<tabstop>kDateEdit</tabstop>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic