From 1d10ab9976b20d7f66c9062e039a57e0a3a34160 Mon Sep 17 00:00:00 2001 From: Dirk Wilden Date: Wed, 29 Oct 2008 12:09:14 +0000 Subject: [PATCH] updated recentfiles switch saveFunctions back to use only target objects git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@3611 383ad7c9-94d9-4d36-a494-682f7c89f535 --- Core/Core.cc | 9 ++++++--- Core/saveFunctions.cc | 22 +++------------------- Icons/PolyType.png | Bin 651 -> 449 bytes Icons/SVG/PolyType.svg | 21 +++++++++++++++------ Icons/SVG/TriangleType.svg | 21 +++++++++++++++------ Icons/TriangleType.png | Bin 1626 -> 948 bytes Icons/folder_grey.png | Bin 0 -> 877 bytes widgets/coreWidget/CoreWidget.cc | 2 ++ widgets/coreWidget/MenuBar.cc | 2 +- 9 files changed, 42 insertions(+), 35 deletions(-) create mode 100644 Icons/folder_grey.png diff --git a/Core/Core.cc b/Core/Core.cc index 7a913d8d..daa09fcc 100644 --- a/Core/Core.cc +++ b/Core/Core.cc @@ -688,7 +688,10 @@ Core::slotRecentOpen(QAction* _action) QVector< OpenFlipper::Options::RecentFile > recentFiles = OpenFlipper::Options::recentFiles(); for (int i = 0 ; i < recentFiles.size() ; ++i ) if ( recentFiles[i].filename == _action->text() ){ - loadObject(recentFiles[i].type, recentFiles[i].filename); + if (recentFiles[i].type == DATA_NONE) + loadSettings( recentFiles[i].filename ); + else + loadObject(recentFiles[i].type, recentFiles[i].filename); break; } } @@ -985,9 +988,9 @@ void Core::setDescriptions(){ "(only works if GUI is available)", QString("object-id,filename").split(","), QString("id of the object, initial filename for the dialog").split(",")); - emit setSlotDescription("saveAllObjects()", "Saves all opened objects. Before overwriting the user is asked. " + emit setSlotDescription("saveAllObjects()", "Saves all target objects. " "If no filename is available a dialog is shown. (only works if GUI is available)",QStringList(), QStringList()); - emit setSlotDescription("saveAllObjectsTo()", "Saves all opened objects. The locations can be chosen in dialogs. " + emit setSlotDescription("saveAllObjectsTo()", "Saves all target objects. The locations can be chosen in dialogs. " "(only works if GUI is available)",QStringList(), QStringList()); emit setSlotDescription("saveSettings()", "Show the dialog to save the current setting. (only works if GUI is available)",QStringList(), QStringList()); //load slots diff --git a/Core/saveFunctions.cc b/Core/saveFunctions.cc index 78a99e1c..c239aede 100644 --- a/Core/saveFunctions.cc +++ b/Core/saveFunctions.cc @@ -128,30 +128,14 @@ void Core::saveAllObjects(){ supportedTypes_[i].plugin->saveOptionsWidget(""); //iterate over all target objects - bool overwrite_all = false; - - for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS) ; + for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::TARGET_OBJECTS) ; o_it != PluginFunctions::objects_end(); ++o_it) { if ( !QDir(o_it->path()).exists() || o_it->path().trimmed() == "" ) // if path isn't valid use 'save object to' saveObjectTo(o_it->id(),o_it->name()); else{ - //ask for overwriting + //save (existing files will be overwritten) QString filename = o_it->path() + OpenFlipper::Options::dirSeparator() + o_it->name() ; - QFile file(filename); - if ( file.exists() && !overwrite_all){ - int ret = QMessageBox::warning(coreWidget_, tr("File exists"),QString("The file '" +filename+ "' already exists.\n"+ - "Do you want to overwrite the file?"),QMessageBox::YesToAll | - QMessageBox::Yes|QMessageBox::No|QMessageBox::NoToAll,QMessageBox::No); - switch(ret){ - case QMessageBox::YesToAll: overwrite_all = true;break; - case QMessageBox::Yes: break; - case QMessageBox::No: continue; - case QMessageBox::NoToAll: return; - } - } - - // and save saveObject(o_it->id(),filename); } } @@ -165,7 +149,7 @@ void Core::saveAllObjectsTo(){ if ( OpenFlipper::Options::gui() ){ if (supportedTypes_.size() != 0){ //iterate over all target objects - for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::ALL_OBJECTS); + for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::TARGET_OBJECTS); o_it != PluginFunctions::objects_end(); ++o_it) { QString filename = o_it->path() + OpenFlipper::Options::dirSeparator() + o_it->name(); saveObjectTo(o_it->id(),filename); diff --git a/Icons/PolyType.png b/Icons/PolyType.png index bda744d16206aac33b5502d036ac0dc67a13e114..79fc8da4a8fcf6a6bc8374b688242b800b4347fe 100644 GIT binary patch delta 435 zcmeBXJ;*#kqMn0|fq_BJzGEYhVkvg=4B-HR8jh3>AfL0qBeIx*f%iHHGdgL^t^f*3 zmbgZg1m~xflqVLYGL)B>>t*I;7bhncr0V4trO$q6BgMeLXy@tT7?RQWcGgBOW=8>s z`zn6?hN)qNcc*spqcDD6~9k*l4RQXQZ zL~PqJGx45o_?eu9la+V@>xzk6 z?_W>fUFH8o-28x=;=1nNYTwO_|MTqd>+-RfxcJ6xjw?SH#8`g@3;8dZ)qmG@%|oSY z1%lZ-I!x<@G>e7f@H`2p`VX72})q5egaTvNEtc?`jyt^iEHm35Bt1vcZVs= z?6&TR!(cmCxT&OWs1ljD{>(4s2NlxHVIDdujCVw@*|WwqRwmBf9?|gQzT+{V%ljybvyLWiWdJA-|uf6c*ZilCOv6V^M`+( z4XhvEu^xCY&?3o_`0Vuy>1(C2*QaL4950l4A7?jF#dDI1pk~)1jZ=45|7`f~=o%>E zy74dPf!E(|nfP8daXhX zBd57!&RUlF>tN&ge@=E^&suna#O}X8{`g~s&AR#ar#I=GwyT#b2ux>loZ%>t26hmB z=FG#^ZMFBm*Y219z3=^RyNlo3E|zkGtP)$aE%){|)lW9(Kks?{OdjN%zdwS%OUUqD z0{X7>_s4BhE2qC**1h|>Af6tD^Upv3 zTzU6T<-F&Wej+T60xT}efIg|LyK~vxa>c4ut6tS@W}MU9ZDq`Hh^NV*S>cQV2La}s zdkb!r2>`?LDEH@cpKZbP0l+XkKNJ=2J diff --git a/Icons/SVG/PolyType.svg b/Icons/SVG/PolyType.svg index 5f1c3c0d..7b4866d6 100644 --- a/Icons/SVG/PolyType.svg +++ b/Icons/SVG/PolyType.svg @@ -2,7 +2,7 @@ + id="defs4"> + + + inkscape:window-y="142" + showgrid="false" /> diff --git a/Icons/SVG/TriangleType.svg b/Icons/SVG/TriangleType.svg index 00c46c4e..50b56fa8 100644 --- a/Icons/SVG/TriangleType.svg +++ b/Icons/SVG/TriangleType.svg @@ -2,7 +2,7 @@ + id="defs4"> + + + inkscape:window-y="142" + showgrid="false" /> diff --git a/Icons/TriangleType.png b/Icons/TriangleType.png index faed94a227e67158511cb9fc5a624ee09cca2317..890bbfe772258ba75ac7b5c749331be98f3ac4ec 100644 GIT binary patch delta 938 zcmV;b16BOm473N37=H)`0000UKZvma000DYLP=Bz2nYy#2xN!=000SaNLh0L01ejw z01ejxLMWSf0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$TF-b&0 zRA_)N-*kz4=`8=HdYZ*h=>T$k3*dyX2+@#!}Y6WaWti{(jg>9L+P|FzVdBlGy^r4}*1k=@A zJ6F^r5r1($4k@Sj%~{u_r_VX3oJF<0TW1BIQVzdcn+VcH@itp~jsX>3hQF|{DTuDQ zU#eg>uLQ{3_!}Er0J#{yV6IgVY*Vt!(@jHk>3B>D{OLi*_8sgI@g+9k+RQvwDUv<=av^F!tOGSMW+bIQ}s z)Cz)ZRx;S$MnG^Sj^eeIg6PuyVzq#iO@O?IUk7ny2n=o|fdMh(zq(^X13eycAKO5)tc^U%(D!=JfyCJ0KBpFZL_XJ3lA^)+r0ieD1f8KI@jM->$rg&1B}> zQXsEjQ>T7WSzNc==cf8BHRjvQyssz7*&{Bie;61ySp^w4IcGrr1w_zKWGH1njsgEo1NZ*FXC?=Xby7{_eT=e$Vgw{r$26*i0QwLro0B zbbNgnfp~O+K~}@BZ1J{fJg9|lW-=BKjbOzqd`5%ovm*|VK4^H$4tc;Nk4uZfBYGdJ zCU1FzVXDKv4BEED-tj_~51qBFg~>W&om;FPI*2Bc1v0?6Ud2f_=T623uqr;Vy;kk!w>K=D9wWm;r*>6!?_}5>ifr zu5&e9KW~wb<+O-L3D7 ziU$SKe-*O`CQax2?T z4#ekg8Ja~hO!XIMK6>jw{{@kB$cJ?Ixst>E)#*7uc)uF}M6(gD>LT69%{}da)m0)5 z#giC*z>L*-!)#1?dxBDFy;IZzn5iQmGW87z^(f3)>CFT(w&nKP+tD-%(mMBhfVIA6 zhP7mQOaJ{OPIgozkn`D%f~IghceRE#9n8A~Z|5$K)5(Ui9k*@HP^jvmJp*Q!@x52B zKRz;Gf>*JY;9>tKg-;n8v#hHH-uEtjS@dFn>(;M#zB#XMyt!6f0@CCUW1E~K*yp5$DonXm<3kAr-2}Ome0>Mxd z#$$Sjq>z@FBLvGfmMLvcH-_O~#hxM9RN@8`VK;kEV%4xKUq5~I64At7svYQJhkR-4 z0QvDfdt#=9f>{KE^`R3c(GA0G_uH9I&MZEne8Ha~mOxxFq+iY;d_;zIvFy z8{e2^-Pc^(4HA=5D<1hzeM+DO+ty#$o0&JibCzH5zXSHMKs|?#4Q(t)KHtuq#7}?B M*Ne@lq=yOq18)r*K>z>% diff --git a/Icons/folder_grey.png b/Icons/folder_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..bcddf00fec2c10555fcfb7ae9f277268940ea5a5 GIT binary patch literal 877 zcmV-z1CsoSP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00l7s00l7tx9uoW00007bV*G`2iOW7 z3knasf4Tbr00QkvL_t(&-tC#OYZO5g#=kf3$!d%V3tB`F1i`-{*oh!m9bzfuFS%HV zt(|2W3%igq0kN>We?bl*APVP6mYkQ_+-7#3#qFMx5KRP0X5a=Ej=g4n`+eVg^L9y9 zk@7M~d?gPcCvR+TZ@kD=VAEoGpxVPWSfq zUUfR17tvVAd!MT+>bgGjA|hH|UhZyfZM}@fLf(7Sb$x#MrV#5pJ3H$av03Nb=b|Vc ztgWqm|1SUy1hOo*`qzR;+rw3f-^4=e*Y6SpQRe2GS17==oD+&=s4M0R_o3Dr*2s4*0001PQK=`{9 z5wRk2j4O`;F9dps2&1qF@)h)5X#Q0$e5nJI8dDMWNkfdl|%3bcJ-Rz|(|6gz}5 zhT0&j>a>go$xaG@nM)CoQF|ji>BVfJV80_V#tfL*0Pp}P>N`FP(F!s>=N9 z%iT-JfHB6jxt#)3Rb?lWiLutQsz%$5n^}NW)nr*VwLKA;e!t%vkH-tDYQmu*wyWt? zW;`A*^!xoD5gBS)@?8MW0ptJ}K&(Mf05yODz&ilD)Qph=;1+<}0B!=f5-GqDfFA(9 z0T`;Pn>DUx%;83nm=*8addAction(QIcon(path), recentFiles[i].filename); diff --git a/widgets/coreWidget/MenuBar.cc b/widgets/coreWidget/MenuBar.cc index 173ce263..66497ac1 100644 --- a/widgets/coreWidget/MenuBar.cc +++ b/widgets/coreWidget/MenuBar.cc @@ -134,7 +134,7 @@ void CoreWidget::setupMenuBar() //Save object QAction* AC_Save = new QAction(tr("&Save Object"), this); AC_Save->setShortcut (Qt::CTRL + Qt::Key_S); - AC_Save->setStatusTip(tr("Save objects")); + AC_Save->setStatusTip(tr("Save currently selected objects")); AC_Save->setWhatsThis("Saves all currently selected objects"); icon.addFile(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"document-save.png"); AC_Save->setIcon(icon); -- GitLab