Hi Chris
Here's the patch for you to try. For me, it looks OK on Ubuntu now, so
should be OK for you, too. Windows, we'll see if it helps, but I can't
see it making any difference so far as the Title bars are concerned.
Let's know how it goes. There are some outstanding issues with
scrolling and resizing. I'm pretty close with those but didn't want to
make more changes until this first lot is tried.
Allan
>From 1ad907df9aedf33cc6f42d45b18b596267a758b5 Mon Sep 17 00:00:00 2001
From: Allan Anderson <agande...@gmail.com>
Date: Tue, 8 Apr 2014 12:13:51 +0100
Subject: [PATCH] Modify CSV importer settings and UI to correct appearance on
Ubuntu.
---
kmymoney/plugins/csvimport/bankingwizardpage.ui | 36 +--
kmymoney/plugins/csvimport/csvdialog.cpp | 36 ++-
kmymoney/plugins/csvimport/csvdialog.h | 2 +
kmymoney/plugins/csvimport/introwizardpage.ui | 49 +---
kmymoney/plugins/csvimport/investmentwizardpage.ui | 268 ++++++++++-----------
5 files changed, 185 insertions(+), 206 deletions(-)
diff --git a/kmymoney/plugins/csvimport/bankingwizardpage.ui b/kmymoney/plugins/csvimport/bankingwizardpage.ui
index d2179bf..6af0ab6 100644
--- a/kmymoney/plugins/csvimport/bankingwizardpage.ui
+++ b/kmymoney/plugins/csvimport/bankingwizardpage.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>675</width>
+ <width>737</width>
<height>240</height>
</rect>
</property>
@@ -26,8 +26,14 @@
<string>Banking Wizard Page</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
+ <property name="leftMargin">
+ <number>2</number>
+ </property>
+ <property name="rightMargin">
+ <number>2</number>
+ </property>
<item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout" stretch="4,100,4">
+ <layout class="QHBoxLayout" name="horizontalLayout" stretch="2,100,2">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@@ -136,7 +142,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
@@ -236,13 +242,13 @@ p, li { white-space: pre-wrap; }
</property>
<property name="minimumSize">
<size>
- <width>65</width>
+ <width>45</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
@@ -294,13 +300,13 @@ p, li { white-space: pre-wrap; }
</property>
<property name="minimumSize">
<size>
- <width>65</width>
+ <width>45</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
@@ -358,7 +364,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
@@ -452,13 +458,13 @@ p, li { white-space: pre-wrap; }
</property>
<property name="minimumSize">
<size>
- <width>65</width>
+ <width>45</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
@@ -516,7 +522,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
@@ -571,13 +577,13 @@ p, li { white-space: pre-wrap; }
</property>
<property name="minimumSize">
<size>
- <width>65</width>
+ <width>45</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
@@ -629,13 +635,13 @@ p, li { white-space: pre-wrap; }
</property>
<property name="minimumSize">
<size>
- <width>65</width>
+ <width>45</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>60</width>
+ <width>50</width>
<height>40</height>
</size>
</property>
diff --git a/kmymoney/plugins/csvimport/csvdialog.cpp b/kmymoney/plugins/csvimport/csvdialog.cpp
index 3ab7f95..ccd86d8 100644
--- a/kmymoney/plugins/csvimport/csvdialog.cpp
+++ b/kmymoney/plugins/csvimport/csvdialog.cpp
@@ -105,7 +105,7 @@ CSVDialog::CSVDialog(QWidget *parent) : QWidget(parent), ui(new Ui::CSVDialog)
m_fieldDelimiterIndex = 0;
m_rowHght = 30;
m_header = 27;
- m_borders = 14;
+ m_borders = 6;
m_tableHeight = m_header + m_rowHght * m_tableRows + m_borders;
m_minimumHeight = 595;
m_windowWidth = geometry().width();
@@ -114,6 +114,7 @@ CSVDialog::CSVDialog(QWidget *parent) : QWidget(parent), ui(new Ui::CSVDialog)
m_lastId = -1;
m_fileEndLine = 0;
m_hScrollBarHeight = 0;
+ m_vScrollBarWidth = 17;
m_memoColList.clear();
m_profileList.clear();
@@ -144,6 +145,10 @@ void CSVDialog::init()
ui->horizontalLayout->setStretch(1, 1);
ui->horizontalLayout->setStretch(2, 50);//350
ui->horizontalLayout->setStretch(3, 1);
+
+ ui->gridLayout->setContentsMargins(2,2,2,2);
+ ui->gridLayout_2->setContentsMargins(4,2,4,8);
+ ui->verticalLayout_7->setContentsMargins(4,2,4,2);
this->setAutoFillBackground(true);
@@ -691,7 +696,7 @@ void CSVDialog::slotFileDialogClicked()
m_csvPath.truncate(posn + 1); // keep last "/"
readSettings();
- rect = ui->frame_main->frameRect();
+
QString str = "~/" + m_csvPath.section('/', 3);
KConfigGroup dirGroup(config, profileName);
if (m_pageIntro->ui->checkBoxSkipSetup) {
@@ -714,7 +719,6 @@ void CSVDialog::slotFileDialogClicked()
m_pageIntro->initializePage();
} else {
m_wizard->next();
- rect = ui->frame_main->frameRect();
}
}
@@ -978,9 +982,10 @@ void CSVDialog::displayLine(const QString& data)
m_inBuffer.clear();
QStringList::const_iterator constIterator;
QString txt;
+ QTableWidgetItem *item;
for (constIterator = m_columnList.constBegin(); constIterator != m_columnList.constEnd(); ++constIterator) {
txt = (*constIterator);
- QTableWidgetItem *item = new QTableWidgetItem;// new item for UI
+ item = new QTableWidgetItem; // new item for UI
item->setText(txt);
if (txt.toDouble() != 0.0) {
item->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
@@ -1541,8 +1546,11 @@ void CSVDialog::redrawWindow(int startLine)
if ((row >= m_lineList.count()) || (row >= m_fileEndLine)) {
break;
}
- if (ui->tableWidget->item(row, col) == 0) { // cell does not exist
- continue;
+ if (ui->tableWidget->item(row, col) == 0) { // cell does not exist
+ QTableWidgetItem *item = new QTableWidgetItem;// add marker to UI
+ item->setText(QString('-'));
+ ui->tableWidget->setItem(row, col, item);
+ m_columnTypeList << QString();
}
//
// Ensure colwidth is wide enough for true data width.
@@ -1570,13 +1578,13 @@ void CSVDialog::redrawWindow(int startLine)
tableHeight = m_tableHeight + m_hScrollBarHeight;
rect = ui->frame_main->frameRect();
rect.setHeight(tableHeight);
- ui->frame_main->setFrameRect(rect);
- if (m_maxRowWidth > ui->tableWidget->width() - ui->tableWidget->verticalScrollBar()->width() - ui->tableWidget->verticalHeader()->width()) {
+
+ if (m_maxRowWidth > ui->tableWidget->width() - m_vScrollBarWidth - ui->tableWidget->verticalHeader()->width()) {
+ //
// Wide enough for scroll-bar to show
- if (m_hScrollBarHeight != 17) {
- m_hScrollBarHeight = 17;
- tableHeight = m_tableHeight + m_hScrollBarHeight;
- }
+ //
+ m_hScrollBarHeight = 17;
+ tableHeight = m_tableHeight + m_hScrollBarHeight;
rect = ui->frame_main->frameRect();
rect.setHeight(tableHeight);
@@ -1594,7 +1602,9 @@ void CSVDialog::redrawWindow(int startLine)
txt.remove(QRegExp(pattern)).toDouble(&ok); // is this a true numeric?
if (ok) {
ui->tableWidget->item(row, col)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
- } else {
+ } else if (txt == QString('-')) {
+ ui->tableWidget->item(row, col)->setTextAlignment(Qt::AlignCenter | Qt::AlignVCenter);
+ } else {
ui->tableWidget->item(row, col)->setTextAlignment(Qt::AlignLeft | Qt::AlignVCenter);
}
}
diff --git a/kmymoney/plugins/csvimport/csvdialog.h b/kmymoney/plugins/csvimport/csvdialog.h
index 6716ca4..544a9f2 100644
--- a/kmymoney/plugins/csvimport/csvdialog.h
+++ b/kmymoney/plugins/csvimport/csvdialog.h
@@ -168,6 +168,8 @@ public:
int m_initHeight;
int m_startHeight;
int m_hScrollBarHeight;
+ int m_vScrollBarWidth;
+
int m_header;
int m_borders;
int m_possibleDelimiter;
diff --git a/kmymoney/plugins/csvimport/introwizardpage.ui b/kmymoney/plugins/csvimport/introwizardpage.ui
index 9bd29f5..4501f03 100644
--- a/kmymoney/plugins/csvimport/introwizardpage.ui
+++ b/kmymoney/plugins/csvimport/introwizardpage.ui
@@ -48,7 +48,7 @@
</spacer>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_main" stretch="35,0,3,2,0,30,2,0,55,0,2">
+ <layout class="QVBoxLayout" name="verticalLayout_main" stretch="45,3,3,3,30,3,55,15">
<item>
<widget class="QLabel" name="label">
<property name="minimumSize">
@@ -81,7 +81,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
- <spacer name="verticalSpacer_4">
+ <spacer name="verticalSpacer_top">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -101,20 +101,7 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <spacer name="verticalSpacer_5">
+ <spacer name="verticalSpacer_upper">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -181,20 +168,7 @@ p, li { white-space: pre-wrap; }
</layout>
</item>
<item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <spacer name="verticalSpacer_6">
+ <spacer name="verticalSpacer_lower">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -269,20 +243,7 @@ Only useful if a profile has already been setup.</string>
</layout>
</item>
<item>
- <spacer name="verticalSpacer_7">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <spacer name="verticalSpacer">
+ <spacer name="verticalSpacebottom">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
diff --git a/kmymoney/plugins/csvimport/investmentwizardpage.ui b/kmymoney/plugins/csvimport/investmentwizardpage.ui
index 3744963..8c4f477 100644
--- a/kmymoney/plugins/csvimport/investmentwizardpage.ui
+++ b/kmymoney/plugins/csvimport/investmentwizardpage.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>675</width>
- <height>240</height>
+ <width>746</width>
+ <height>238</height>
</rect>
</property>
<property name="minimumSize">
@@ -26,12 +26,6 @@
<string>Investment Wizard Page</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
- <property name="topMargin">
- <number>2</number>
- </property>
- <property name="bottomMargin">
- <number>2</number>
- </property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="1,200,1">
<item>
@@ -41,14 +35,14 @@
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>5</width>
+ <width>13</width>
<height>257</height>
</size>
</property>
</spacer>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout" stretch="50,150,3">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label">
<property name="maximumSize">
@@ -71,7 +65,7 @@
</widget>
</item>
<item>
- <layout class="QGridLayout" name="gridLayout" rowstretch="4,0,0,0,0,0" columnstretch="22,10,10,11,16,11,18">
+ <layout class="QGridLayout" name="gridLayout" columnstretch="60,5,10,5,10,5,20">
<item row="0" column="0">
<widget class="QLabel" name="labelInv_date">
<property name="minimumSize">
@@ -176,7 +170,7 @@
<widget class="QLabel" name="labelInv_priceFraction">
<property name="minimumSize">
<size>
- <width>85</width>
+ <width>100</width>
<height>0</height>
</size>
</property>
@@ -201,13 +195,13 @@
<widget class="KComboBox" name="comboBoxInv_priceFraction">
<property name="minimumSize">
<size>
- <width>80</width>
+ <width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>90</width>
+ <width>100</width>
<height>24</height>
</size>
</property>
@@ -279,6 +273,22 @@
</property>
</widget>
</item>
+ <item row="1" column="2">
+ <widget class="QLabel" name="labelInv_quantity">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="accessibleName">
+ <string comment="column containing quantity field"/>
+ </property>
+ <property name="text">
+ <string>Quantity</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
<item row="1" column="3">
<widget class="KComboBox" name="comboBoxInv_quantityCol">
<property name="maximumSize">
@@ -295,6 +305,46 @@
</property>
</widget>
</item>
+ <item row="1" column="4">
+ <widget class="QLabel" name="labelInv_feeCol">
+ <property name="accessibleName">
+ <string comment="column containing fee field"/>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string comment="column containing fee field">Fee Column</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="5">
+ <widget class="KComboBox" name="comboBoxInv_feeCol">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>100</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string><p align="center">If necessary, select column containing fee.
+Caution. This might already have been
+incorporated into the price.</span></p></string>
+ </property>
+ <property name="maxVisibleItems">
+ <number>12</number>
+ </property>
+ </widget>
+ </item>
<item row="2" column="0">
<widget class="QLabel" name="labelInv_memo">
<property name="maximumSize">
@@ -359,8 +409,67 @@
</property>
</widget>
</item>
- <item row="3" column="0" colspan="6">
- <widget class="Line" name="line">
+ <item row="2" column="4" colspan="2">
+ <widget class="QCheckBox" name="checkBoxInv_feeType">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>170</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Check box if any fee is a percentage figure rather than a value.</string>
+ </property>
+ <property name="accessibleName">
+ <string comment="select if fee is a percentage (not value)"/>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::RightToLeft</enum>
+ </property>
+ <property name="text">
+ <string comment="select if fee is a percentage (not value)">Fee is Percentage </string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="6">
+ <widget class="KPushButton" name="button_clear">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>120</width>
+ <height>24</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Clear selected column entries.</string>
+ </property>
+ <property name="text">
+ <string comment="verb, to clear selected columns">Clear selections</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="7">
+ <widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -453,7 +562,7 @@
</property>
<property name="maximumSize">
<size>
- <width>90</width>
+ <width>100</width>
<height>24</height>
</size>
</property>
@@ -475,7 +584,7 @@
</property>
<property name="maximumSize">
<size>
- <width>115</width>
+ <width>130</width>
<height>20</height>
</size>
</property>
@@ -490,7 +599,7 @@
</property>
</widget>
</item>
- <item row="5" column="1" colspan="4">
+ <item row="5" column="1" colspan="5">
<widget class="KComboBox" name="comboBoxInv_securityName">
<property name="enabled">
<bool>false</bool>
@@ -503,7 +612,7 @@
</property>
<property name="maximumSize">
<size>
- <width>16777215</width>
+ <width>440</width>
<height>25</height>
</size>
</property>
@@ -525,17 +634,17 @@ The names are retained and may be selected from the list here.</p></string
</property>
</widget>
</item>
- <item row="5" column="5">
+ <item row="5" column="6">
<widget class="KPushButton" name="buttonInv_hideSecurity">
<property name="minimumSize">
<size>
- <width>95</width>
+ <width>110</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>100</width>
+ <width>150</width>
<height>24</height>
</size>
</property>
@@ -550,115 +659,6 @@ The names are retained and may be selected from the list here.</p></string
</property>
</widget>
</item>
- <item row="2" column="6">
- <widget class="KPushButton" name="button_clear">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>115</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>120</width>
- <height>24</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Clear selected column entries.</string>
- </property>
- <property name="text">
- <string comment="verb, to clear selected columns">Clear selections</string>
- </property>
- </widget>
- </item>
- <item row="2" column="4" colspan="2">
- <widget class="QCheckBox" name="checkBoxInv_feeType">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>25</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Check box if any fee is a percentage figure rather than a value.</string>
- </property>
- <property name="accessibleName">
- <string comment="select if fee is a percentage (not value)"/>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="text">
- <string comment="select if fee is a percentage (not value)">Fee is Percentage </string>
- </property>
- </widget>
- </item>
- <item row="1" column="4">
- <widget class="QLabel" name="labelInv_feeCol">
- <property name="accessibleName">
- <string comment="column containing fee field"/>
- </property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string comment="column containing fee field">Fee Column</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="5">
- <widget class="KComboBox" name="comboBoxInv_feeCol">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>24</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>90</width>
- <height>24</height>
- </size>
- </property>
- <property name="toolTip">
- <string><p align="center">If necessary, select column containing fee.
-Caution. This might already have been
-incorporated into the price.</span></p></string>
- </property>
- <property name="maxVisibleItems">
- <number>12</number>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QLabel" name="labelInv_quantity">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="accessibleName">
- <string comment="column containing quantity field"/>
- </property>
- <property name="text">
- <string>Quantity</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
</layout>
</item>
</layout>
@@ -670,8 +670,8 @@ incorporated into the price.</span></p></string>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>5</width>
- <height>257</height>
+ <width>13</width>
+ <height>248</height>
</size>
</property>
</spacer>
--
1.8.1.2
_______________________________________________
KMyMoney-devel mailing list
KMyMoney-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmymoney-devel
