From 7dc868140d0b3c686d1464779d6a3ffc34c627eb Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Thu, 20 Jul 2017 22:21:59 +0800 Subject: [PATCH] improve the about menu, add manual and issue report link --- DSView/CMakeLists.txt | 1 + DSView/DSView.qrc | 6 ++- DSView/darkstyle/style.qss | 2 +- DSView/icons/about.png | Bin 1059 -> 1169 bytes DSView/icons/bug.png | Bin 0 -> 1594 bytes DSView/icons/dsl_logo.png | Bin 16354 -> 10917 bytes DSView/icons/logo_color.png | Bin 2199 -> 860 bytes DSView/icons/logo_noColor.png | Bin 1716 -> 721 bytes DSView/icons/manual.png | Bin 0 -> 1238 bytes DSView/icons/support.png | Bin 0 -> 1561 bytes DSView/icons/wiki.png | Bin 3561 -> 0 bytes DSView/pv/dialogs/about.cpp | 68 ++++++++++++++++++++++++++------- DSView/pv/dialogs/about.h | 6 +-- DSView/pv/toolbars/logobar.cpp | 37 +++++++++++++----- DSView/pv/toolbars/logobar.h | 6 ++- 15 files changed, 94 insertions(+), 32 deletions(-) mode change 100644 => 100755 DSView/icons/about.png create mode 100755 DSView/icons/bug.png mode change 100644 => 100755 DSView/icons/dsl_logo.png mode change 100644 => 100755 DSView/icons/logo_color.png mode change 100644 => 100755 DSView/icons/logo_noColor.png create mode 100755 DSView/icons/manual.png create mode 100755 DSView/icons/support.png delete mode 100644 DSView/icons/wiki.png diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt index f96a5270..94586530 100644 --- a/DSView/CMakeLists.txt +++ b/DSView/CMakeLists.txt @@ -400,6 +400,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_ install(TARGETS ${PROJECT_NAME} DESTINATION bin/) install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) +install(FILES ../NEWS DESTINATION share/${PROJECT_NAME}/res RENAME NEWS) install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) install(FILES DSView.desktop DESTINATION /usr/share/applications/) diff --git a/DSView/DSView.qrc b/DSView/DSView.qrc index f560529f..5006620f 100644 --- a/DSView/DSView.qrc +++ b/DSView/DSView.qrc @@ -16,7 +16,6 @@ icons/protocol.png icons/logo_noColor.png icons/logo_color.png - icons/about.png icons/capture.png icons/stop.png icons/start.png @@ -32,7 +31,6 @@ icons/search-bar_dis.png icons/params_dis.png icons/gear.png - icons/wiki.png icons/wait.gif icons/instant_dis.png icons/start_dis.png @@ -64,5 +62,9 @@ icons/del.png icons/add_dis.png icons/del_dis.png + icons/about.png + icons/manual.png + icons/bug.png + icons/support.png diff --git a/DSView/darkstyle/style.qss b/DSView/darkstyle/style.qss index f23c1ea1..28636f46 100755 --- a/DSView/darkstyle/style.qss +++ b/DSView/darkstyle/style.qss @@ -609,7 +609,7 @@ background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.6 #4E4D4D, stop: 1 #302F2F); } -QComboBox:hover,QAbstractSpinBox:hover,QLineEdit:hover,QTextEdit:hover,QPlainTextEdit:hover,QAbstractView:hover,QTreeView:hover +QComboBox:hover,QAbstractSpinBox:hover,QLineEdit:hover,QPlainTextEdit:hover,QAbstractView:hover,QTreeView:hover { border: 1px solid #606060; color: silver; diff --git a/DSView/icons/about.png b/DSView/icons/about.png old mode 100644 new mode 100755 index c8f40c627d26318641b74f55b2678426b57b357b..94bac48d0842e06933a583c59e11dbadfddaddf7 GIT binary patch delta 968 zcmV;(12_Dm2$2bpiGSe-1_dz^wWw8E000ADNklTHaK~Xe$@E}se1Lg82k&H-&+)79;&6Ff}HKcJVBFqJoam?R? zV=jAt``G8~4&)DtaE$Wep@jB*I3FPngAFWR{=@^Xl55x)B~`{ zA90YzHj^vj62XEK~&3}rf%mS{70rDHtiC0~8y&S4m( zEVFjbK~-^@N8B@SyI7~`s@fg>y18>TpgQBMb1Xd7ehq*Om2jC{7pcd9N}xtDiiw&N zVv{936h*j8g62_iCLt4&fPf47+?>iC!{fYX#Pz)Uy!4CmlKAc)#P9jbPCFLzChpmQSX z>LCm8&cp&lYrh;|viW~6Cz8r6%31inf8t3V;u7Hd@^)AN^6+^X>o?_#}6-XsKQ zW0k4tOuv8{@}l}*p%z=jY*sVEw!zQ;fxFz`9%GnE*|{2z|2g-XrGF1SR*w9BL{Y9@B&G-K09(2N4%8N% z*Av~=0nP7bpZo6s?)rNW(-F(w9m-dp5`~ytzlOB|>FRr~)J-s*D0o+Y^&Mfo? z0NTr1hv_{x30qwIG8_B*5f{>Azv)3m3J2{0X9ezqL0KToshySsbeIp6QzdH0_C#v_ch1t+i%5r0GwMFjK6Bab{rkw*@b zW~qLPx-HBu4)Yr&6?u^Xga zOXB?Z_yW|jAVlAmVnP*fAY2S?VD+8dXHax(3VJs^~ z`ED(}wt;=hyQ8>;gRyVt8>;k5j&=VD>X5_}>{UK9q!@FYdl$#)r|+sW)Xn~iuQ^Hf zs&cs4Uw_rIPpdys?Ctxs?8muXoyXR`N6UVeoqn0@?00ci!+w`cC&ou04)mp0d6$SR|8YY-%KO8fU;>i z^I~*Z=%2z_b9)wZLP7bIU5g922_5*S#2dOjRvIDO&{7fP`2H6RQCb z`)%=;{}3@70JB{XM_3#SBX08!ngO&rjQ$${D##HaajiIy5vZFfuwYFnN~HK$BnuG0pOWJ^%m! diff --git a/DSView/icons/bug.png b/DSView/icons/bug.png new file mode 100755 index 0000000000000000000000000000000000000000..3fc8004e9a6e759a6c1e136f6df94994d39411a0 GIT binary patch literal 1594 zcmV-A2F3Y_P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0063uBQgL0010qNS#tmY4c7nw4c7reD4Tcy000McNliru;Rg!^3ocCrFL?j} z1qew*K~!ko<(XS-RYeqr|9$9%a#4Yx4bWJmYC$3f+lbL92$5K!0a1t{R)j<;v4{zY z#Gp@-;59~hG5SIZiQF1vgAhX0G*KfMxml%PL2J1wwg0-bENBC95*HNHBm9e)T>rC>o=!+aNvwmk%}}y1(Kv@r`}()Qj(>Q z)4ahgfkNNRYqXLorM^ahTy4}O^HQX#%9A8@Ym44>e(@1}y4Glk@+9@@j9S!Y49!~S z^aLNqT<+mHcA2qw+3LTVUZ981s3bRVI1k`i`~<*n^TeEe$N;F>E^_KH%3V6hcN!+0ORi;zg?OaZ<73wjK)loG#SK^*Y zZHrW`vA(UfDzru0pPXSitWoy;51R?}&;msp!R0YrE+W$Er< zJ5MppaARA>uX_(86M)9^MUu6P2PBCyVoCa+DNblLjJgcy9c-sa97}@yoaM}62}g|P z5aSHcy_`*h_(+o2n5J)KN_=WKXmn>;MFs2FMtg$iF>%1K*~!z_`b!SA#-)YF$zc^8 zE`2y5Ni@1xE>gt^p5XU5RSK@<8uQu0WdII{Vrp1q<|8?uHx0o3lVK3sB`GC$60;~S z8(hAZp)8~(akAV#sttHc)RREJ#O&utFADF3Ca^X{c!_+Dhazymc0#gjMozcB3)O>@ zwiA+lH=G`dfc0!(AwZ5wZ4jO^EhGVzDBR9g$k=cMri2RbV+?ErW`rj2V2HL%wtVAJ z$+`~w?Oi9D4VUM&RQV~k0!t0xPe$t`N7a?0?N+VxiDV8Wj8m%umQ<3YOU_LaQQbI* zwlNhuf5da3O_v7&Aq6bMlB8W1B{Kz17q@Ayaz(;3Mw2yJk9dOk8@0naq(+^QlkoIt zpVR55i-$ue;h*03B(~46F2o@B%U17uAsc~)&;<5*n{5ORhbHhtC<0DYr$U8qasCQ7 z0@9D!?7trZCqofvvN>d^jv1kqnyFm1YgQ-%D=1chE@_YIQ_3+fp=h8mA@n*Bms8B~ z8@`-#z954UfL>;%M@w5w8L8vyFUNN1jQaGXZq3Nmz8RfYogx~iN=ec=O?BGjEv6E< z%CqKu2n%T&)Cfdb9IvlgK@VWRN98W#xIRf+mLZ52fhhMSVXOzBlL_7g_5*N%l-n>K zcDbDOBGAJ_DG0;40Kmsy;b)rWH7>SS0ugx01);{I;+>fZd=0>9w@W4*>U|T~>WZGn zX#jTG`d^j7KFR>t2pmZ-_6 z03~!qSaf7zbY(hYa%Ew3WdJfTF*hwRH!U$SR4_Fh($ literal 0 HcmV?d00001 diff --git a/DSView/icons/dsl_logo.png b/DSView/icons/dsl_logo.png old mode 100644 new mode 100755 index d2502a2890d7da4f01ab5277a83ce587715cf5e1..de0412116b9c23967e6fe3ffa6e8a332ba89c0ce GIT binary patch literal 10917 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 diff --git a/DSView/icons/logo_color.png b/DSView/icons/logo_color.png old mode 100644 new mode 100755 index 7a2e44eb4a8f5a66979bdd77562f2750fe42627d..0761dd75243d998014e4d7822092b13f6483db50 GIT binary patch delta 813 zcmbO(c!zC*%ETn;`iJanY=Xj}x&O@>7#P?~Tq8;xOG`5Hix^g}JL3Tq;sFV{q!uR^ zWfqiV=I1d8b1EtW#koM@&iMtEMVaXtB@Ao$&sYIP`M{z@sfi$^3MHAjsSKvy`8k0y zoFJLt{Irtt#G+J&*nI3WG3 z9ViBNTX249QF1E7*ZN1x3f0p2|Eh3{lB^Uu!6&pZGYG_1Xl{w+c5G^5MR*iA}$rRWJl3-HY@MU%S(8! z*f`Ew5O6?Rp+lGH;E^}~L_GEEeowk{cV7AV7yC|0Ri{6{KlkQb>qw8JiGll=H!Kx< zFgwcO=9VhisK`PiN~7adX7_e);s$jPu3z->;XR`I(tHlc9gky9Tx;G5wc{v=rtzp9)*Z=4RHs zTH(RAvk$a5HXNGSFln{_l8{_Ki_R$H(mOzeVyEdmFG4tS|WBQ zMO?~RNQv`ziukMUH<~7*HK8Z;8a8C;K66iFbbIY}?MN?^+*>&}h6RTny!)ek_+FeNc~y85}Sb4q9e0FE|d!vFvP delta 2160 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 TD*CaT00000NkvXXu0mjffDI7x diff --git a/DSView/icons/manual.png b/DSView/icons/manual.png new file mode 100755 index 0000000000000000000000000000000000000000..2927f4b6cadbee0667a9369afe2e4c7db8056d2d GIT binary patch literal 1238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;mUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Sk<`)5*!c}Z`(9f!FfcFiba4#Hxc7Eue1=S@Nc(>2 zo?C6xmMvR4YuD11Q*X6Mtq2j27ZGGVDz3Xke`!>9&(|Z&T~hZSY{=bwT>s2XmOpip zzpm^pXqfuVVwMrmIA+_u0S!5+74f!}ObrihZ6~Wca3+aCy6@mAjX_aNk*=n9#O zYp$25HH!!PCs%oTpT3x{e>D#+c>Cz7UQ$9Cuy~{e((HVKG5XJ~BYr_Ru9!{^X=-I&?Hean$EOe@-b zP2Z(5h`hbA@ly0cD`ti{U27Ul>RM(oM_J*p*zN;-a?A<74l7hdFEG~}yTtHZ zb03r04J!xs^~d6OE?=Q$()hCf^9oI-{3GY4Zs5%RY8!2NdWT?!erz{iLYEA4?DFc$ z*4;un3T6iy{;mA!BY#cgvPqHgYOQ@Q_O}P?a}-JueC>hH`8tOkkw(nf3_9>p$`u+qD`EY#!9VY7D| z?!Wq_AhqSV+rD7^_~Scj7lkfpcYpJ<;K>UgGri`Lz}JfzFXi85TWxJ*yX4*;zDrBW zLeq^JIe6bZtJ`*Inj`xGlj9PP7Ffo<{UI+YwIb?zPMHHR3#*p6MwFx^mZVxG7o`Fz z1|tJQb6o=2D?NY%?PN}v7CMhd8i!PC{xWt~$(697{@2Xp`c literal 0 HcmV?d00001 diff --git a/DSView/icons/support.png b/DSView/icons/support.png new file mode 100755 index 0000000000000000000000000000000000000000..2903d7022725b3cc2370f4ab24ed6dc4aa877bff GIT binary patch literal 1561 zcmZ`(YdjNr82*nKLnN0hDr+=kwy|hJtI1|_sU?xy*q9>>b3LkwVpz0PREVNna_KHo zo!nNDQb`xrm|WIWs7Pl%o)724`#itrdEfWKy?bQg`M02AgUS9^Vw2IBnm|$ zZAjrgO8bEl9w%oUB^j2LZgVDH)gkiBT(o~(EL-^YxW7=cxp8``Yx7L1xaZk@Yw^5; z<$V9v`Rp*wi4kuPzsKRTmxO zX7$#N!ip*tl3eJNu!u5x~ejR^G+ z&DM~0S`Usn8h6u$ch6RcR^^K7l@=AmTXU`2+@00zgtMy0yT>)UyE@CSGioo_kMYauk(Id%%&br))hf-S=ytita`EvVCoz;N> zrAt2AsL~E{FGd^YQRV%>>sl`|j?c)8IoBY#TXZ5q$;a9SuhkVqvt`||UZ+;t_27bT5 zq6|+W(j=W1P*II{%$g>QB(d0$xRBUqZC!UopNv14CnQ;>ueU3K%qc#-eR;;}yv-Bs ziz$)&yYjncEPasceBZkeDvSw3Cb9vwtWKlX&pe>QLQZlPX|JAHVw*Z; z=~xq5Yi&+PC?rqHFR6=aY9M=YXF_kvb-N+b3uu^_pvKk3Iwxn0f*U)Tk~*DClakY| zTRv;|#Gn(3gWstnS11?eBApnfzW$Y@pKn6>1@MaGV=w2{cHHQSS6VYE??*^H4NQDf zuN7*#v5(=xi;x0$uXJ9CM5(4))LgkQ^|tpH>UYmVn3ZdBnn1*p%q{MaDBUC$4Xt!25ewj_*rBoxEiF#fO z(R*yfp5vH0{BPoZtw-3wZ5Gc*PQ-8s;$`HfbTwI0BI}$20`^ zM;~P^XvB5g&t)>WEJ9E;OGW^P!CISRtj)35y%;)o5(V-DxF+mIt3mq99a$d3xE;|AgM^{qKj)0^8 E0-->v&j0`b literal 0 HcmV?d00001 diff --git a/DSView/icons/wiki.png b/DSView/icons/wiki.png deleted file mode 100644 index 8e06ac1d36e740da743e03be081ee26252c71665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3561 zcmV004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 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 diff --git a/DSView/pv/dialogs/about.cpp b/DSView/pv/dialogs/about.cpp index 93cd4dce..85254ea3 100644 --- a/DSView/pv/dialogs/about.cpp +++ b/DSView/pv/dialogs/about.cpp @@ -23,6 +23,11 @@ #include #include +#include +#include +#include +#include +#include #include "about.h" @@ -32,22 +37,59 @@ namespace dialogs { About::About(QWidget *parent) : DSDialog(parent, true) { - QPixmap pix(":/icons/dsl_logo.png"); - _logo = new QLabel(this); - _logo->setPixmap(pix); - _logo->setAlignment(Qt::AlignCenter); + setFixedHeight(360); - _info = new QLabel(this); - _info->setText(tr("%1 %2
%4") - .arg(QApplication::applicationName()) - .arg(QApplication::applicationVersion()) - .arg(QApplication::organizationDomain())); - _info->setOpenExternalLinks(true); - _info->setAlignment(Qt::AlignCenter); + #if defined(__x86_64__) || defined(_M_X64) + QString arch = "x64"; + #elif defined(__i386) || defined(_M_IX86) + QString arch = "x86"; + #endif + + QString version = tr("DSView %1 (%2)
") + .arg(QApplication::applicationVersion()) + .arg(arch); + + QString url = tr("Website: %1
" + "Gitbub: %2
" + "

") + .arg(QApplication::organizationDomain()) + .arg("https://github.com/DreamSourceLab/DSView"); + + QString thanks = tr("Special Thanks
" + "All backers on kickstarter
" + "All members of Sigrok project
" + "All contributors of open-source projects
" + "

") + .arg("https://www.kickstarter.com/projects/dreamsourcelab/dslogic-multifunction-instruments-for-everyone") + .arg("http://sigrok.org/"); + + QString changlogs = tr("Changelogs
"); + QDir dir(DS_RES_PATH); + QString filename = dir.absolutePath() + "/NEWS"; + QFile news(filename); + if (news.open(QIODevice::ReadOnly)) { + QTextStream stream(&news); + QString line; + while (!stream.atEnd()){ + line = stream.readLine(); + changlogs += line + "
"; + } + } + + QPixmap pix(":/icons/dsl_logo.png"); + QImage logo = pix.toImage(); + + QTextBrowser *about = new QTextBrowser(this); + about->setOpenExternalLinks(true); + about->setFrameStyle(QFrame::NoFrame); + QTextCursor cur = about->textCursor(); + cur.insertImage(logo); + cur.insertHtml("


"); + cur.insertHtml(version+url+thanks+changlogs); + about->moveCursor(QTextCursor::Start); QVBoxLayout *xlayout = new QVBoxLayout(); - xlayout->addWidget(_logo); - xlayout->addWidget(_info); + xlayout->addWidget(about); layout()->addLayout(xlayout); setTitle(tr("About")); diff --git a/DSView/pv/dialogs/about.h b/DSView/pv/dialogs/about.h index 59b14233..a82377e7 100644 --- a/DSView/pv/dialogs/about.h +++ b/DSView/pv/dialogs/about.h @@ -27,6 +27,8 @@ #include #include "dsdialog.h" +#include + namespace pv { namespace dialogs { @@ -37,10 +39,6 @@ class About : public DSDialog public: explicit About(QWidget *parent = 0); ~About(); - -private: - QLabel *_logo; - QLabel *_info; }; } // namespace dialogs diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp index a7f64c21..5cae32b6 100644 --- a/DSView/pv/toolbars/logobar.cpp +++ b/DSView/pv/toolbars/logobar.cpp @@ -52,14 +52,23 @@ LogoBar::LogoBar(SigSession &session, QWidget *parent) : _logo_button.addAction(_about); connect(_about, SIGNAL(triggered()), this, SLOT(on_actionAbout_triggered())); - _wiki = new QAction(this); - _wiki->setText(QApplication::translate( - "File", "&Wiki", 0)); - _wiki->setIcon(QIcon::fromTheme("file", - QIcon(":/icons/wiki.png"))); - _wiki->setObjectName(QString::fromUtf8("actionWiki")); - _logo_button.addAction(_wiki); - connect(_wiki, SIGNAL(triggered()), this, SLOT(on_actionWiki_triggered())); + _manual = new QAction(this); + _manual->setText(QApplication::translate( + "File", "&Manual", 0)); + _manual->setIcon(QIcon::fromTheme("file", + QIcon(":/icons/manual.png"))); + _manual->setObjectName(QString::fromUtf8("actionManual")); + _logo_button.addAction(_manual); + connect(_manual, SIGNAL(triggered()), this, SLOT(on_actionManual_triggered())); + + _issue = new QAction(this); + _issue->setText(QApplication::translate( + "File", "&Bug Report", 0)); + _issue->setIcon(QIcon::fromTheme("file", + QIcon(":/icons/bug.png"))); + _issue->setObjectName(QString::fromUtf8("actionManual")); + _logo_button.addAction(_issue); + connect(_issue, SIGNAL(triggered()), this, SLOT(on_actionIssue_triggered())); _logo_button.setPopupMode(QToolButton::InstantPopup); _logo_button.setIcon(QIcon(":/icons/logo_noColor.png")); @@ -106,10 +115,18 @@ void LogoBar::on_actionAbout_triggered() dlg.exec(); } -void LogoBar::on_actionWiki_triggered() +void LogoBar::on_actionManual_triggered() { + QDir dir(QCoreApplication::applicationDirPath()); QDesktopServices::openUrl( - QUrl(QLatin1String("http://www.dreamsourcelab.com/wiki"))); + QUrl("file:///"+dir.absolutePath() + "/ug.pdf")); +} + +void LogoBar::on_actionIssue_triggered() +{ + QDir dir(QCoreApplication::applicationDirPath()); + QDesktopServices::openUrl( + QUrl(QLatin1String("https://github.com/DreamSourceLab/DSView/issues"))); } void LogoBar::enable_toggle(bool enable) diff --git a/DSView/pv/toolbars/logobar.h b/DSView/pv/toolbars/logobar.h index ad486b9e..021d3320 100644 --- a/DSView/pv/toolbars/logobar.h +++ b/DSView/pv/toolbars/logobar.h @@ -53,7 +53,8 @@ signals: private slots: void on_actionAbout_triggered(); - void on_actionWiki_triggered(); + void on_actionManual_triggered(); + void on_actionIssue_triggered(); private: bool _enable; @@ -62,7 +63,8 @@ private: QToolButton _logo_button; QAction *_about; - QAction *_wiki; + QAction *_manual; + QAction *_issue; };