From 10325ee8a9c3a82004f9ca2587d82a834a722c41 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 2 Sep 2016 23:00:12 +0200 Subject: [PATCH] refs #755, mapping UI improvements * make drop area more obvious by icon and color * improve forms so the layout looks better on large screens * button to display model dialog (like distributor, ICAO, ...) --- .../components/dbmappingcomponent.cpp | 4 ++-- src/blackgui/components/dbmappingcomponent.h | 6 ++--- src/blackgui/components/dbmappingcomponent.ui | 6 ++--- src/blackgui/components/dbstashcomponent.cpp | 9 ++++++++ src/blackgui/components/dbstashcomponent.h | 3 +++ src/blackgui/components/dbstashcomponent.ui | 8 +++++++ src/blackgui/dropsite.cpp | 14 +++++++----- src/blackgui/editors/aircrafticaoform.ui | 6 ++--- src/blackgui/editors/airlineicaoform.ui | 2 +- src/blackgui/editors/distributorform.ui | 8 +++---- src/blackgui/editors/liveryform.ui | 19 ++-------------- src/blackgui/labelandicon.ui | 21 +++++++++++------- src/blackgui/share/qss/stdwidget.qss | 9 ++++---- src/blackmisc/blackmisc.qrc | 3 +++ src/blackmisc/icons/own/dropHere.pdn | Bin 0 -> 5445 bytes src/blackmisc/icons/own/drophere16.png | Bin 0 -> 433 bytes src/blackmisc/icons/own/drophere24.png | Bin 0 -> 595 bytes src/blackmisc/icons/own/drophere48.png | Bin 0 -> 1047 bytes 18 files changed, 67 insertions(+), 51 deletions(-) create mode 100644 src/blackmisc/icons/own/dropHere.pdn create mode 100644 src/blackmisc/icons/own/drophere16.png create mode 100644 src/blackmisc/icons/own/drophere24.png create mode 100644 src/blackmisc/icons/own/drophere48.png diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp index e908f5f0d..929641060 100644 --- a/src/blackgui/components/dbmappingcomponent.cpp +++ b/src/blackgui/components/dbmappingcomponent.cpp @@ -447,7 +447,7 @@ namespace BlackGui } } - void CDbMappingComponent::ps_modifyModelDialog() + void CDbMappingComponent::modifyModelDialog() { // only one model selected, use as default if (ui->comp_StashAircraft->view()->hasSingleSelectedRow()) @@ -945,7 +945,7 @@ namespace BlackGui this->m_menuActions[0] = menuActions.addAction(this->m_menuActions[0], CIcons::appAircraftIcao16(), "Current aircraft ICAO", CMenuAction::pathStashEditor(), this, { mapComp, &CDbMappingComponent::ps_applyFormAircraftIcaoData }); this->m_menuActions[1] = menuActions.addAction(this->m_menuActions[1], CIcons::appDistributors16(), "Current distributor", CMenuAction::pathStashEditor(), this, { mapComp, &CDbMappingComponent::ps_applyFormDistributorData }); this->m_menuActions[2] = menuActions.addAction(this->m_menuActions[2], CIcons::appLiveries16(), "Current livery", CMenuAction::pathStashEditor(), this, { mapComp, &CDbMappingComponent::ps_applyFormLiveryData }); - this->m_menuActions[3] = menuActions.addAction(this->m_menuActions[3], CIcons::databaseTable16(), "Modify DB model data", CMenuAction::pathStashEditor(), this, { mapComp, &CDbMappingComponent::ps_modifyModelDialog }); + this->m_menuActions[3] = menuActions.addAction(this->m_menuActions[3], CIcons::databaseTable16(), "Modify DB model data", CMenuAction::pathStashEditor(), this, { mapComp, &CDbMappingComponent::modifyModelDialog }); } this->nestedCustomMenu(menuActions); } diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h index 95cb9dd88..0894265bc 100644 --- a/src/blackgui/components/dbmappingcomponent.h +++ b/src/blackgui/components/dbmappingcomponent.h @@ -187,6 +187,9 @@ namespace BlackGui //! Stash models void stashSelectedModels(); + //! Open model modify dialog + void modifyModelDialog(); + signals: //! Request to filter by livery void filterByLivery(const BlackMisc::Aviation::CLivery &livery); @@ -273,9 +276,6 @@ namespace BlackGui //! Apply current DB data from form void ps_applyFormDistributorData(); - //! Open model modify dialog - void ps_modifyModelDialog(); - //! Add to own model set void ps_addToOwnModelSet(); diff --git a/src/blackgui/components/dbmappingcomponent.ui b/src/blackgui/components/dbmappingcomponent.ui index b64b4e20a..bc7162538 100644 --- a/src/blackgui/components/dbmappingcomponent.ui +++ b/src/blackgui/components/dbmappingcomponent.ui @@ -250,7 +250,7 @@ 0 - 100 + 110 @@ -288,13 +288,13 @@ 0 0 882 - 425 + 450 0 - 425 + 450 diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp index b3410303c..dfab1dfb0 100644 --- a/src/blackgui/components/dbstashcomponent.cpp +++ b/src/blackgui/components/dbstashcomponent.cpp @@ -72,6 +72,7 @@ namespace BlackGui connect(ui->pb_AirlineIcao, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverPartsToSelected); connect(ui->pb_Livery, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverPartsToSelected); connect(ui->pb_Distributor, &QPushButton::pressed, this, &CDbStashComponent::ps_copyOverPartsToSelected); + connect(ui->pb_Model, &QPushButton::pressed, this, &CDbStashComponent::ps_modifyModelDialog); ui->tvp_StashAircraftModels->menuAddItems(CAircraftModelView::MenuRemoveSelectedRows); ui->tvp_StashAircraftModels->setHighlightModelStrings(true); @@ -450,6 +451,14 @@ namespace BlackGui } } + void CDbStashComponent::ps_modifyModelDialog() + { + if (this->getMappingComponent()) + { + this->getMappingComponent()->modifyModelDialog(); + } + } + void CDbStashComponent::ps_onRowCountChanged(int number, bool filter) { Q_UNUSED(number); diff --git a/src/blackgui/components/dbstashcomponent.h b/src/blackgui/components/dbstashcomponent.h index acd9e0739..617d13b9f 100644 --- a/src/blackgui/components/dbstashcomponent.h +++ b/src/blackgui/components/dbstashcomponent.h @@ -159,6 +159,9 @@ namespace BlackGui //! Copy over values void ps_copyOverPartsToSelected(); + //! Display model dialog + void ps_modifyModelDialog(); + //! Row count changed void ps_onRowCountChanged(int number, bool filter); diff --git a/src/blackgui/components/dbstashcomponent.ui b/src/blackgui/components/dbstashcomponent.ui index 3d3c979d4..d906f1a7c 100644 --- a/src/blackgui/components/dbstashcomponent.ui +++ b/src/blackgui/components/dbstashcomponent.ui @@ -124,6 +124,13 @@ + + + + Model + + + @@ -171,6 +178,7 @@ pb_RemoveInvald pb_Publish cb_SelectedOnly + pb_Model pb_Distributor pb_AircraftIcao pb_Livery diff --git a/src/blackgui/dropsite.cpp b/src/blackgui/dropsite.cpp index fa79857fd..613614105 100644 --- a/src/blackgui/dropsite.cpp +++ b/src/blackgui/dropsite.cpp @@ -27,12 +27,13 @@ namespace BlackGui { CDropSite::CDropSite(QWidget *parent) : QLabel(parent) { - setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); - setAlignment(Qt::AlignCenter); - setAcceptDrops(true); - this->setInfoText(tr("")); - connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CDropSite::ps_onStyleSheetsChanged); + this->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel); + this->setAlignment(Qt::AlignCenter); + this->setAcceptDrops(true); + this->setTextFormat(Qt::RichText); + this->setInfoText("drop data here"); this->ps_onStyleSheetsChanged(); + connect(sGui, &CGuiApplication::styleSheetsChanged, this, &CDropSite::ps_onStyleSheetsChanged); } void CDropSite::setInfoText(const QString &dropSiteText) @@ -50,7 +51,8 @@ namespace BlackGui void CDropSite::resetText() { - setText(this->m_infoText); + const QString html = "  " + this->m_infoText.toHtmlEscaped(); + setText(html); } void CDropSite::dragEnterEvent(QDragEnterEvent *event) diff --git a/src/blackgui/editors/aircrafticaoform.ui b/src/blackgui/editors/aircrafticaoform.ui index ccdda0d77..60667c030 100644 --- a/src/blackgui/editors/aircrafticaoform.ui +++ b/src/blackgui/editors/aircrafticaoform.ui @@ -7,13 +7,13 @@ 0 0 402 - 241 + 271 0 - 220 + 225 @@ -40,7 +40,7 @@ Aircraft ICAO - + diff --git a/src/blackgui/editors/airlineicaoform.ui b/src/blackgui/editors/airlineicaoform.ui index 6a0a3ad2d..0cf564b9a 100644 --- a/src/blackgui/editors/airlineicaoform.ui +++ b/src/blackgui/editors/airlineicaoform.ui @@ -40,7 +40,7 @@ Airline ICAO - + diff --git a/src/blackgui/editors/distributorform.ui b/src/blackgui/editors/distributorform.ui index 636c45df1..974ccf47b 100644 --- a/src/blackgui/editors/distributorform.ui +++ b/src/blackgui/editors/distributorform.ui @@ -6,14 +6,14 @@ 0 0 - 299 - 175 + 297 + 200 0 - 175 + 185 @@ -40,7 +40,7 @@ Distributor - + diff --git a/src/blackgui/editors/liveryform.ui b/src/blackgui/editors/liveryform.ui index 774d89cbc..2e6496cc7 100644 --- a/src/blackgui/editors/liveryform.ui +++ b/src/blackgui/editors/liveryform.ui @@ -2,14 +2,6 @@ CLiveryForm - - - 0 - 0 - 361 - 422 - - Livery editor @@ -34,7 +26,7 @@ Livery - + @@ -140,14 +132,7 @@ - - - QFrame::StyledPanel - - - QFrame::Raised - - + diff --git a/src/blackgui/labelandicon.ui b/src/blackgui/labelandicon.ui index 79a212def..fe4bc22f2 100644 --- a/src/blackgui/labelandicon.ui +++ b/src/blackgui/labelandicon.ui @@ -2,14 +2,6 @@ CLabelAndIcon - - - 0 - 0 - 50 - 15 - - Frame @@ -52,6 +44,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + diff --git a/src/blackgui/share/qss/stdwidget.qss b/src/blackgui/share/qss/stdwidget.qss index fbfc73063..aa8dad4e5 100644 --- a/src/blackgui/share/qss/stdwidget.qss +++ b/src/blackgui/share/qss/stdwidget.qss @@ -119,12 +119,13 @@ BlackGui--COverlayMessages { } BlackGui--CDropSite { - color: blue; - border: 2px solid green; + color: grey; + border: 2px dashed grey; border-radius: 5px; - min-height: 20px; - max-height: 20px; + min-height: 18px; + max-height: 18px; margin: 2px; + padding: 2px; } /* Validator bar */ diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index e16e941b4..f2094e695 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -423,6 +423,9 @@ icons/own/swift/swiftCircle512.png icons/own/swift/swiftCircle1024.png icons/own/swift/swiftCartoonNova64.png + icons/own/drophere24.png + icons/own/drophere48.png + icons/own/drophere16.png icons/qled/circle_black.svg diff --git a/src/blackmisc/icons/own/dropHere.pdn b/src/blackmisc/icons/own/dropHere.pdn new file mode 100644 index 0000000000000000000000000000000000000000..f2779adee2fdab9dd8e2a4abad82528e19921590 GIT binary patch literal 5445 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 S@`0Y4mQL%QtxC5;C;uZS@Fhk7 literal 0 HcmV?d00001 diff --git a/src/blackmisc/icons/own/drophere16.png b/src/blackmisc/icons/own/drophere16.png new file mode 100644 index 0000000000000000000000000000000000000000..b446ff359ad98fa4fc365c8c70445c89ca685d10 GIT binary patch literal 433 zcmV;i0Z#sjP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^5z3JSmg00ALML_t(IPqmV*O9W9A#YY7}5N$@gSqv77 z!ED&3!8Mu`%##e;2VvTLf;0buU5pl+!7eC@sBQe6=Y7Mv%r36zfy3N)@44sQ`~k#mSxXfEQ(^^WaE*h=?*3h;vgEGKjYr$p1|8rn){`XJvg0@W$Y2si4XzloHx1P@Y@i?KH=KI% b5d^^}I{#ZbVV^0100000NkvXXu0mjfSsA#! literal 0 HcmV?d00001 diff --git a/src/blackmisc/icons/own/drophere24.png b/src/blackmisc/icons/own/drophere24.png new file mode 100644 index 0000000000000000000000000000000000000000..d11d33fa6d0a20888c8e5ebb45770796ffa6e726 GIT binary patch literal 595 zcmV-Z0<8UsP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^5z3JSmg00F~EL_t(YOYM|9O9N35h1Uo8=mc%7w6WAe z>;y$DtV9b73mdTz8_`-wD#0>^MI<3_Vq)bVFr~GHU?qZxU?D-lx5jTalaNW&RZOt) zz~SDxbLPx!a(A6SMIw<{gezXmWHKFE@-t9;1q)sbhr>Nu@-tBEHb^Fu;dng0T}^U# zb!qUKfmhxW{|(BBMx%rLX=oGKN^e&F@eyK*e%h`m=94DL2ws1Jl;Wg{GuOT_N zK^5=eY9J73Q&|y(LZK;@N{x~{6(P;!3i?^+YQzfi({R0FFljg|1FOUpjYGez5~tJY z0SXR@rO7!>C#AV7t^&DXG{<%8!WSsFV+XC=t|y*yBNz;Js=N&2X@U=+6HmblC=(0wG+vMaRAyj2P4ERU9YS*i z&oCd8#+s^u@ic)4LZMJEx2%uthqtN(<7t9A!FZaWPB5OOfZsT$`(IPNYM!7GbQ_dj h>qgN1{4@}b^A0~#Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^5z3JSmg00W0fL_t(&L+#j2h)z))$8j^GF(z-5w-Kq4 z2n&jZ?64tH*eDhXg|f60QC5^v7D&;Qq--cGY?POhSRfk|%4=Tp{`UC(p6^zIReQ1hxol4AL3@&&N zr9L#nx=tl#Fa{SKSU^F)FJL)lR^b8s`hH(PRTD_9cg$dn)Cr{4J7zFO>I72j9Wxjs zbpomNjv0)RI)T)B#|*|uoj_{6V+LcSP9U}3F@rHuCy-k2*F_Uz$)Cr3%sh}C;SPdF5nHU>-ZjH8``oS4aKIzumX2boM0uX3#jBR zwxAu2u8-ANx6%S!!FO2AEdO!=53w4f(BSv!($rzlU`)pud`7Y16CB4OPrKDCgz-BH z_4n}u#cN%|VzgR)x&<5x^h`{`L41JUR6C;u%);1Alhr4L@oib%cie zR&5dEX5&0`Yx=vYomda;dbeH8#^e+WCM@KdF$Wj$Rbw-HulMDNAM3wJ*>x|w^_w!D67dS7EHuotX_rs ztv-eSAZlmMK@*#R!*~w=P4fj>ly)=f6`a-O6bmL|F+wSMd)10`=zE z1f2n0-ZVYQYIBMO6V;$*2z20FhX47Y1r_giowzHZS94Y8M^>LxESRVkb$YmU@SMUY z^)YCH3t@g1RO0n1Q!JS14QlmpPsD!cK=S+Q)YkjI*{Y4<^(s>=m`Fj7(a?9h9$X!C z`dpZbs=k+ssP8t#d|16-MnZbHu2J1&@&|hX?@f@@C Rc`^V1002ovPDHLkV1m{k=%4@q literal 0 HcmV?d00001