Changeset 790 for Vago/trunk
- Timestamp:
- Apr 6, 2013, 10:54:26 PM (12 years ago)
- Location:
- Vago/trunk/Vago
- Files:
-
- 2 added
- 22 edited
-
Vago.pro (modified) (1 diff)
-
Vago.pro.user (modified) (6 diffs)
-
about.cpp (modified) (1 diff)
-
about.ui (modified) (2 diffs)
-
main.cpp (modified) (3 diffs)
-
mainwindow.cpp (modified) (6 diffs)
-
mainwindow.ui (modified) (5 diffs)
-
oni_icon_mac.png (added)
-
packageWizard/packagepage2.cpp (modified) (1 diff)
-
packageWizard/packagepage2.ui (modified) (6 diffs)
-
packageWizard/packagepage4.cpp (modified) (1 diff)
-
packageWizard/packagepage4.ui (modified) (5 diffs)
-
packageWizard/packagepagefinal.cpp (modified) (1 diff)
-
packageWizard/packagepagefinal.ui (modified) (2 diffs)
-
preferences.ui (modified) (4 diffs)
-
resources.qrc (modified) (1 diff)
-
soundWizard/soundpage2.cpp (modified) (1 diff)
-
soundWizard/soundpage2.ui (modified) (2 diffs)
-
soundWizard/soundpage3.ui (modified) (1 diff)
-
soundWizard/soundpage4.ui (modified) (1 diff)
-
soundWizard/soundpagefinal.cpp (modified) (1 diff)
-
soundWizard/soundpagefinal.ui (modified) (1 diff)
-
util.h (modified) (2 diffs)
-
vago_icon.icns (added)
Legend:
- Unmodified
- Added
- Removed
-
Vago/trunk/Vago/Vago.pro
r771 r790 13 13 INCLUDEPATH += ./soundWizard 14 14 15 macx { 16 LIBS += -lz # for mac support zipping (thanks edt!) 17 ICON = vago_icon.icns # mac os icon 18 } 19 20 win32 { 21 RC_FILE = icon_resource.rc #for windows explorer icon 22 } 23 15 24 TARGET = Vago 16 25 TEMPLATE = app 17 RC_FILE = icon_resource.rc #for windows explorer icon18 26 19 27 SOURCES += \ -
Vago/trunk/Vago/Vago.pro.user
r789 r790 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <!DOCTYPE QtCreatorProject> 3 <!-- Written by Qt Creator 2.4.1, 2013-04-0 3T22:20:09. -->3 <!-- Written by Qt Creator 2.4.1, 2013-04-06T21:29:29. --> 4 4 <qtcreator> 5 5 <data> … … 57 57 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> 58 58 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> 59 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain. Mingw:C:/MinGW/bin/g++.exe.x86-windows-msys-pe-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>59 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb</value> 60 60 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> 61 61 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> … … 98 98 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> 99 99 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> 100 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8. 1 for Desktop - MinGW (Qt SDK) Debug</value>100 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.4 in PATH (System) Debug</value> 101 101 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 102 102 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> 103 103 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> 104 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"> C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_1_for_Desktop_-_MinGW__Qt_SDK__Debug</value>105 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId"> 5</value>104 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Debug</value> 105 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> 106 106 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> 107 107 </valuemap> 108 108 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> 109 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain. Mingw:C:/MinGW/bin/g++.exe.x86-windows-msys-pe-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>109 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb</value> 110 110 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> 111 111 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> … … 148 148 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> 149 149 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> 150 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8. 1 for Desktop - MinGW (Qt SDK) Release</value>150 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.4 in PATH (System) Release</value> 151 151 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 152 152 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> 153 153 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> 154 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"> C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_1_for_Desktop_-_MinGW__Qt_SDK__Release</value>155 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId"> 5</value>154 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Release</value> 155 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value> 156 156 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> 157 157 </valuemap> 158 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> 159 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> 160 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> 161 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> 162 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> 163 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 164 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> 165 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> 166 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> 167 <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> 168 <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> 169 </valuemap> 170 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> 171 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> 172 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 173 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> 174 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> 175 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> 176 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> 177 </valuemap> 178 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> 179 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> 180 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 181 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> 182 </valuemap> 183 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> 184 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> 185 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> 186 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 187 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> 188 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> 189 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> 190 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> 191 </valuemap> 192 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> 193 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> 194 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 195 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> 196 </valuemap> 197 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> 198 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> 199 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> 200 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.0 for Desktop - MinGW (Qt SDK) Debug</value> 201 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 202 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> 203 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value> 204 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_0_for_Desktop_-_MinGW__Qt_SDK__Debug</value> 205 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> 206 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> 207 </valuemap> 208 <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3"> 209 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value> 210 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> 211 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> 212 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value> 213 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 214 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value> 215 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value> 216 <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value> 217 <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value> 218 <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value> 219 </valuemap> 220 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1"> 221 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> 222 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 223 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> 224 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value> 225 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value> 226 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> 227 </valuemap> 228 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value> 229 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value> 230 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 231 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value> 232 </valuemap> 233 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1"> 234 <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> 235 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value> 236 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 237 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value> 238 <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value> 239 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value> 240 <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value> 241 </valuemap> 242 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value> 243 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value> 244 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 245 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value> 246 </valuemap> 247 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value> 248 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value> 249 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/> 250 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.0 for Desktop - MinGW (Qt SDK) Release</value> 251 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> 252 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value> 253 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value> 254 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_0_for_Desktop_-_MinGW__Qt_SDK__Release</value> 255 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value> 256 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> 257 </valuemap> 258 <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">4</value> 158 <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value> 259 159 <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> 260 160 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> … … 342 242 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value> 343 243 <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/> 344 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"> </value>244 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory">/Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Debug/</value> 345 245 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> 346 246 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> … … 357 257 <data> 358 258 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> 359 <value type="QString">{ d1d804e5-7180-479f-b853-a9ffac018cf5}</value>259 <value type="QString">{c927f4d0-f522-4805-a789-6ae5ac6f06ca}</value> 360 260 </data> 361 261 <data> -
Vago/trunk/Vago/about.cpp
r771 r790 10 10 this->layout()->setSizeConstraint( QLayout::SetFixedSize ); //fixed size 11 11 ui->lbAbout->setOpenExternalLinks(true); //allow navigate to oni central 12 ui->lbAbout->setText(ui->lbAbout->text().replace("Vago GUI","Vago GUI "+GlobalVars::AppVersion)); 12 ui->lbAbout->setText("<html>" 13 "<b>Vago GUI "+GlobalVars::AppVersion+"</b>" 14 "<p style='font-size:small;'>" 15 "Written by s10k<br /><br/>" 16 "Thanks to:<br/>" 17 "Neo for OniSplit<br />" 18 "EdT for testing, suggestions and icon<br />" 19 "demos_kratos for original OniSplit GUI<br />" 20 "Samer/Mukade/EdT for allow me to use Jubei as icon<br />" 21 "Alloc for AIE2 and support<br />" 22 "Paradox for Sound excel plugin and documentation<br />" 23 "Wiki contributors for the documentation<br />" 24 "AE contributors<br />" 25 "and in general to all OniCentral Community<br /><br/>" 26 "Also thanks to: <br />" 27 "StackOverflow Community<br />" 28 "Fabrizio Angius for PKZIP 2.0 for zip handling<br />" 29 "smashingmagazine for the folder icon :)<br />" 30 "<center>" 31 "Visit us at:<br />" 32 "<a href='http://oni.bungie.org'>" 33 "oni.bungie.org" 34 "</center>" 35 "</a>" 36 "</p>" 37 "</html>"); // Don't use rich text in qtdesigner because it generates platform dependent code 13 38 } 14 39 -
Vago/trunk/Vago/about.ui
r771 r790 7 7 <x>0</x> 8 8 <y>0</y> 9 <width> 515</width>10 <height> 369</height>9 <width>600</width> 10 <height>400</height> 11 11 </rect> 12 12 </property> … … 53 53 </property> 54 54 <property name="text"> 55 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 56 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 57 p, li { white-space: pre-wrap; } 58 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 59 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; font-weight:600;">Vago GUI</span></p> 60 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"><br />Written by s10k</span></p> 61 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"><br />Thanks to:</span></p> 62 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Neo for OniSplit<br />EdT for testing, suggestions and icon </span></p> 63 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">demos_kratos for original OniSplit GUI</span></p> 64 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Samer/Mukade/EdT for allow me to use Jubei as icon</span></p> 65 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Alloc for AIE2 and support</span></p> 66 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Paradox for Sound excel plugin and documentation<br />Wiki</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">contributors for the documentation <br />AE</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">contributors<br />and in general to</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">all OniCentral Community</span></p> 67 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;"><br />Also thanks to: <br />StackOverflow</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">Community</span></p> 68 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Fabrizio</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">Angius for PKZIP 2.0 for zip handling<br />smashingmagazine for the folder icon :)<br /><br /></span></p> 69 <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Visit us at:<br /></span><a href="http://oni.bungie.org"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">oni.bungie.org</span></a></p></body></html></string> 55 <string><html> 56 <b>Vago GUI</b> 57 <p style="font-size:small;"> 58 Written by s10k<br /><br/> 59 Thanks to:<br/> 60 Neo for OniSplit<br /> 61 EdT for testing, suggestions and icon<br /> 62 demos_kratos for original OniSplit GUI<br /> 63 Samer/Mukade/EdT for allow me to use Jubei as icon<br /> 64 Alloc for AIE2 and support<br /> 65 Paradox for Sound excel plugin and documentation<br /> 66 Wiki contributors for the documentation<br /> 67 AE contributors<br /> 68 and in general to all OniCentral Community<br /><br/> 69 Also thanks to: <br /> 70 StackOverflow Community<br /> 71 Fabrizio Angius for PKZIP 2.0 for zip handling<br /> 72 smashingmagazine for the folder icon :)<br /> 73 <center> 74 Visit us at:<br /> 75 <a href="http://oni.bungie.org"> 76 oni.bungie.org 77 </center> 78 </a> 79 </p> 80 </html></string> 70 81 </property> 71 82 </widget> -
Vago/trunk/Vago/main.cpp
r771 r790 1 #define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm 2 3 #ifdef USING_VM_TABLET_WARNING_FIX 4 #include <qapplication.h> 5 void myMessageOutput(QtMsgType type, const char *msg); 6 #endif 7 1 8 #include <QtGui/QApplication> 2 9 #include "mainwindow.h" … … 4 11 int main(int argc, char *argv[]) 5 12 { 13 14 #ifdef USING_VM_TABLET_WARNING_FIX 15 qInstallMsgHandler(myMessageOutput); 16 #endif 17 6 18 QApplication a(argc, argv); 7 19 MainWindow w; … … 11 23 return a.exec(); 12 24 } 25 26 #ifdef USING_VM_TABLET_WARNING_FIX 27 void myMessageOutput(QtMsgType type, const char *msg) 28 { 29 switch (type) { 30 case QtWarningMsg: 31 if(QString(msg)=="QCocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message 32 return; 33 } 34 else{ 35 fprintf(stderr, "%s\n", msg); 36 break; 37 } 38 case QtFatalMsg: 39 fprintf(stderr, "%s\n", msg); 40 abort(); 41 default: 42 fprintf(stderr, "%s\n", msg); 43 break; 44 } 45 } 46 #endif -
Vago/trunk/Vago/mainwindow.cpp
r771 r790 10 10 ui->setupUi(this); 11 11 12 ui->pbConvertGeneral->setMinimumSize(ui->pbConvertGeneral->minimumSizeHint()); 13 ui->pbConvertGeneral->setMinimumWidth(50); 14 ui->pbConvertGeneral->setMinimumHeight(ui->pbConvertGeneral->minimumHeight()*1.4); 15 16 17 18 qDebug() << ui->pbConvertGeneral->minimumHeight() << ui->pbConvertGeneral->minimumHeight(); 19 12 20 this->setWindowTitle("Vago v"+GlobalVars::AppVersion); 13 21 14 // QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale ()); 15 16 if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitExeName)){ 22 if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitString)){ 17 23 Util::showErrorPopUp("OniSplit not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit."); 18 24 exit(1); 19 25 } 20 26 21 if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlTools ExeName)){27 if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlToolsString)){ 22 28 Util::showErrorPopUp("xmlTools not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit."); 23 29 exit(1); … … 42 48 43 49 if(aefolder.isEmpty()){ 44 Util::showErrorPopUp("AE folder is mandatory. Application will exit.");50 Util::showErrorPopUp("AE folder is mandatory. Application will now exit."); 45 51 exit(1); 46 52 } … … 99 105 this->myConverter = new Converter(this->myLogger,this->listToProccess); 100 106 107 // User interface 101 108 ui->mainToolBar->addWidget(ui->tbAE); //add ae installer launch button 102 109 ui->mainToolBar->addWidget(ui->emptySpacerLabel); //trick, we can't add directly a space so we add an empty … … 109 116 ui->mainToolBar->setLayoutDirection(Qt::RightToLeft); 110 117 118 #ifdef Q_WS_MAC 119 // setUnifiedTitleAndToolBarOnMac(true); // Qt suggests to use it on mac | http://www.slideshare.net/qtbynokia/how-to-make-your-qt-app-look-native // align on left doesn't work if active 120 ui->tbOni->setIcon(QIcon(":/new/icons/oni_icon_mac.png")); // Oni executable on mac have a different icon than windows 121 // Set mac platform the first one in the menu, and also make it checkable by default 122 ui->menuTarget_Platform->removeAction(ui->actionWindows); 123 ui->menuTarget_Platform->addAction(ui->actionWindows); 124 ui->actionWindows->setChecked(false); 125 ui->actionMac_Windows_demo->setChecked(true); 126 // Hide file menu on mac (not needed) 127 ui->menuFile->hide(); 128 ui->menuFile->close(); 129 //ui->menuBar->macMenu(); 130 #endif 131 111 132 connectSlots(); 112 133 … … 154 175 QStringList arguments; 155 176 156 if(this->vagoSettings->value("OniWindow").toBool()){ // Run in a window?177 if(this->vagoSettings->value("OniWindow").toBool()){ // Run in a window? 157 178 arguments << "-noswitch"; 158 179 } 180 #ifdef Q_WS_WIN 159 181 else{ 160 arguments << "-switch"; 161 } 162 163 arguments << " -debugfiles"; 164 165 if(!QProcess::startDetached(this->AeLocation+"/Oni.exe",arguments,this->AeLocation)){ 182 arguments << "-switch"; // only supported on windows. Was added by daodan dll. 183 } 184 #endif 185 186 arguments << "-debugfiles"; 187 188 if(!QProcess::startDetached(this->AeLocation+"/"+GlobalVars::OniExe,arguments,this->AeLocation)){ 166 189 showErrStatusMessage("Oni could not be started!"); 167 190 } … … 172 195 // If the app turn out someday to a native app use QProcess::startDetached instead... 173 196 174 if(!QDesktopServices::openUrl( this->AeLocation+"/AEInstaller/bin/AEInstaller2.jar")){197 if(!QDesktopServices::openUrl("file:///"+this->AeLocation+"/AEInstaller/bin/AEInstaller2.jar")){ 175 198 showErrStatusMessage("Could not start AE Installer!"); 176 199 } -
Vago/trunk/Vago/mainwindow.ui
r771 r790 8 8 <y>0</y> 9 9 <width>640</width> 10 <height> 480</height>10 <height>543</height> 11 11 </rect> 12 12 </property> … … 360 360 <size> 361 361 <width>0</width> 362 <height> 30</height>362 <height>0</height> 363 363 </size> 364 364 </property> … … 1487 1487 <y>0</y> 1488 1488 <width>640</width> 1489 <height>2 1</height>1489 <height>22</height> 1490 1490 </rect> 1491 1491 </property> … … 1507 1507 <addaction name="actionAbout"/> 1508 1508 </widget> 1509 <widget class="QMenu" name="menuTarget_Plat aform">1509 <widget class="QMenu" name="menuTarget_Platform"> 1510 1510 <property name="title"> 1511 <string>Target Plat aform</string>1511 <string>Target Platform</string> 1512 1512 </property> 1513 1513 <addaction name="actionWindows"/> … … 1537 1537 </widget> 1538 1538 <addaction name="menuFile"/> 1539 <addaction name="menuTarget_Plat aform"/>1539 <addaction name="menuTarget_Platform"/> 1540 1540 <addaction name="menuOptions"/> 1541 1541 <addaction name="menuTools"/> -
Vago/trunk/Vago/packageWizard/packagepage2.cpp
r771 r790 21 21 registerField("lePackageNumber", ui->lePackageNumber); 22 22 registerField("rbReplace", ui->rbReplace); 23 24 ui->lbFieldsReadOnly->setText("<html><span style='color:#0000ff;'>* Fields read only by AEI2 when the package " 25 "isn't at the mod depot.</span></html>"); // Don't use rich text in qtdesigner because it generates platform dependent code 26 QString htmlAsterisk="<html><span style='color:#0000ff;'>*</span></html>"; 27 ui->lbAsteriscAuthors->setText(htmlAsterisk); 28 ui->lbAsteriscModName->setText(htmlAsterisk); 29 ui->lbAsteriscVersion->setText(htmlAsterisk); 30 ui->lbAsteriscDescription->setText(htmlAsterisk); 23 31 } 24 32 -
Vago/trunk/Vago/packageWizard/packagepage2.ui
r771 r790 8 8 <y>0</y> 9 9 <width>400</width> 10 <height> 353</height>10 <height>408</height> 11 11 </rect> 12 12 </property> … … 40 40 </item> 41 41 <item> 42 <widget class="QLabel" name="label_8"> 43 <property name="text"> 44 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 45 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 46 p, li { white-space: pre-wrap; } 47 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 48 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html></string> 42 <widget class="QLabel" name="lbAsteriscModName"> 43 <property name="text"> 44 <string><html><span style="color:#0000ff;">*</span></html></string> 49 45 </property> 50 46 </widget> … … 71 67 </item> 72 68 <item> 73 <widget class="QLabel" name="label_10"> 74 <property name="text"> 75 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 76 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 77 p, li { white-space: pre-wrap; } 78 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 79 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html></string> 69 <widget class="QLabel" name="lbAsteriscAuthors"> 70 <property name="text"> 71 <string><html><span style="color:#0000ff;">*</span></html></string> 80 72 </property> 81 73 </widget> … … 102 94 </item> 103 95 <item> 104 <widget class="QLabel" name="label_9"> 105 <property name="text"> 106 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 107 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 108 p, li { white-space: pre-wrap; } 109 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 110 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html></string> 96 <widget class="QLabel" name="lbAsteriscVersion"> 97 <property name="text"> 98 <string><html><span style="color:#0000ff;">*</span></html></string> 111 99 </property> 112 100 </widget> … … 140 128 </item> 141 129 <item> 142 <widget class="QLabel" name="label_11"> 143 <property name="text"> 144 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 145 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 146 p, li { white-space: pre-wrap; } 147 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 148 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">*</span></p></body></html></string> 130 <widget class="QLabel" name="lbAsteriscDescription"> 131 <property name="text"> 132 <string><html><span style="color:#0000ff;">*</span></html></string> 149 133 </property> 150 134 </widget> … … 320 304 </item> 321 305 <item> 322 <widget class="QLabel" name="l abel_12">306 <widget class="QLabel" name="lbFieldsReadOnly"> 323 307 <property name="text"> 324 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 325 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 326 p, li { white-space: pre-wrap; } 327 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 328 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; color:#0000ff;">* Fields read </span><span style=" font-size:8pt; color:#0000ff;">only</span><span style=" font-size:8pt; color:#0000ff;"> by AEI2 when the package isn't at the mod depot.</span></p></body></html></string> 308 <string><html><span style=" color:#0000ff;">* Fields read only by AEI2 when the package isn't at the mod depot.</span></html></string> 329 309 </property> 330 310 </widget> -
Vago/trunk/Vago/packageWizard/packagepage4.cpp
r771 r790 30 30 ui->tbWindowsMinus->setToolTip("Remove the selected Windows OS folders"); 31 31 ui->tbMacMinus->setToolTip("Remove the selected Mac OS folders"); 32 33 ui->lbCommon->setText("<html><b>Common</b></html>"); // Don't use rich text in qtdesigner because it generates platform dependent code 34 ui->lbWindowsOnly->setText("<html><b>Windows Only</b></html>"); 35 ui->lbMacOnly->setText("<html><b>Mac OS Only</b></html>"); 36 37 32 38 33 39 connectSlots(); -
Vago/trunk/Vago/packageWizard/packagepage4.ui
r771 r790 7 7 <x>0</x> 8 8 <y>0</y> 9 <width>4 08</width>9 <width>413</width> 10 10 <height>300</height> 11 11 </rect> … … 20 20 <layout class="QHBoxLayout" name="horizontalLayout_5"> 21 21 <item> 22 <widget class="QLabel" name="l abel">22 <widget class="QLabel" name="lbCommon"> 23 23 <property name="minimumSize"> 24 24 <size> … … 28 28 </property> 29 29 <property name="text"> 30 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 31 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 32 p, li { white-space: pre-wrap; } 33 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 34 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Common</span></p></body></html></string> 30 <string><html><b>Common</b></html></string> 35 31 </property> 36 32 </widget> … … 92 88 <layout class="QVBoxLayout" name="verticalLayout_3"> 93 89 <item> 94 <widget class="QLabel" name="l abel_2">90 <widget class="QLabel" name="lbWindowsOnly"> 95 91 <property name="text"> 96 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 97 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 98 p, li { white-space: pre-wrap; } 99 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 100 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Windows Only</span></p></body></html></string> 92 <string><html><b>Windows Only</b></html></string> 101 93 </property> 102 94 </widget> … … 140 132 <layout class="QVBoxLayout" name="verticalLayout_5"> 141 133 <item> 142 <widget class="QLabel" name="l abel_3">134 <widget class="QLabel" name="lbMacOnly"> 143 135 <property name="text"> 144 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 145 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 146 p, li { white-space: pre-wrap; } 147 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 148 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Mac OS Only</span></p></body></html></string> 136 <string><html><b>Mac OS Only</b></html> 137 </string> 149 138 </property> 150 139 </widget> -
Vago/trunk/Vago/packageWizard/packagepagefinal.cpp
r771 r790 9 9 this->setTitle("Finished"); 10 10 11 //Use the global var for the depot domain so it's easier to change in the code if the domain changes 12 ui->lbComplete->setText(ui->lbComplete->text().replace("mods.oni2.net",GlobalVars::ModsDomain)); 11 ui->lbComplete->setText("<html>" 12 "The wizard is now complete. The package will be created when you click in finish.<br/>" 13 "After that you can upload the package to <a href='http://"+GlobalVars::ModsDomain+"'>" 14 +GlobalVars::ModsDomain+"</a> to get your mod listed in the AEI." 15 "</html>"); // Don't use rich text in qtdesigner because it generates platform dependent code 13 16 14 17 ui->lbComplete->setOpenExternalLinks(true); //allow navigate to mod depot -
Vago/trunk/Vago/packageWizard/packagepagefinal.ui
r771 r790 7 7 <x>0</x> 8 8 <y>0</y> 9 <width>4 00</width>9 <width>427</width> 10 10 <height>300</height> 11 11 </rect> … … 18 18 <widget class="QLabel" name="lbComplete"> 19 19 <property name="text"> 20 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 21 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 22 p, li { white-space: pre-wrap; } 23 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 24 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">The wizard is now complete. The package will be created when you click in finish.</span></p> 25 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">After that you can upload the package to </span><a href="www.mods.oni2.net"><span style=" text-decoration: underline; color:#0000ff;">mods.oni2.net</span></a><span style=" font-size:8pt;"> to get your mod listed in the AEI.</span></p></body></html></string> 20 <string><html> 21 The wizard is now complete. The package will be created when you click in finish.<br/> 22 After that you can upload the package to <a href="www.mods.oni2.net">mods.oni2.net</a> to get your mod listed in the AEI. 23 </html></string> 26 24 </property> 27 25 </widget> -
Vago/trunk/Vago/preferences.ui
r771 r790 20 20 <string>Preferences</string> 21 21 </property> 22 <layout class="QVBoxLayout" name="verticalLayout_2"> 23 <item> 22 <layout class="QFormLayout" name="formLayout"> 23 <item row="0" column="0"> 24 <widget class="QLabel" name="label"> 25 <property name="minimumSize"> 26 <size> 27 <width>130</width> 28 <height>0</height> 29 </size> 30 </property> 31 <property name="text"> 32 <string>Vago Workspace Folder:</string> 33 </property> 34 </widget> 35 </item> 36 <item row="0" column="1"> 24 37 <layout class="QHBoxLayout" name="horizontalLayout"> 25 <item>26 <widget class="QLabel" name="label">27 <property name="minimumSize">28 <size>29 <width>130</width>30 <height>0</height>31 </size>32 </property>33 <property name="text">34 <string>Vago Workspace Folder:</string>35 </property>36 </widget>37 </item>38 38 <item> 39 39 <widget class="QLineEdit" name="leWorkspace"/> … … 48 48 </layout> 49 49 </item> 50 <item> 50 <item row="1" column="0"> 51 <widget class="QLabel" name="label_2"> 52 <property name="text"> 53 <string>Anniversary Edition Folder:</string> 54 </property> 55 </widget> 56 </item> 57 <item row="1" column="1"> 51 58 <layout class="QHBoxLayout" name="horizontalLayout_2"> 52 <item>53 <widget class="QLabel" name="label_2">54 <property name="text">55 <string>Anniversary Edition Folder:</string>56 </property>57 </widget>58 </item>59 59 <item> 60 60 <widget class="QLineEdit" name="leAEfolder"/> … … 69 69 </layout> 70 70 </item> 71 <item> 72 <widget class="QCheckBox" name="cbOniWindow"> 73 <property name="text"> 74 <string>Launch Oni in a window</string> 75 </property> 76 </widget> 77 </item> 78 <item> 71 <item row="3" column="0" colspan="2"> 79 72 <widget class="QCheckBox" name="cbSeparate"> 80 73 <property name="toolTip"> … … 90 83 </widget> 91 84 </item> 92 <item >85 <item row="4" column="0" colspan="2"> 93 86 <widget class="QCheckBox" name="cbVagoExit"> 94 87 <property name="text"> 95 88 <string>Always confirm Vago exit</string> 89 </property> 90 </widget> 91 </item> 92 <item row="2" column="0" colspan="2"> 93 <widget class="QCheckBox" name="cbOniWindow"> 94 <property name="text"> 95 <string>Launch Oni in a window</string> 96 96 </property> 97 97 </widget> -
Vago/trunk/Vago/resources.qrc
r771 r790 13 13 <file>toolPackage.png</file> 14 14 <file>sound.png</file> 15 <file>oni_icon_mac.png</file> 15 16 </qresource> 16 17 <qresource prefix="/new/about"> -
Vago/trunk/Vago/soundWizard/soundpage2.cpp
r771 r790 12 12 this->soundTable=ui->twSoundFiles; 13 13 ui->twSoundFiles->removeColumn(2); // Only two columns 14 15 ui->label->setText("<html>Add here the files you want to convert. " 16 "All the files will have the same properties applied.<br/>" 17 "Don't forget to first convert the files to an oni compatible codec. " 18 "More information <a href=' '>here.</a></html>"); // Don't use rich text in qtdesigner because it generates platform dependent code 14 19 15 20 // Drop signal for Packages table -
Vago/trunk/Vago/soundWizard/soundpage2.ui
r771 r790 21 21 <widget class="QLabel" name="label"> 22 22 <property name="text"> 23 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 24 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 25 p, li { white-space: pre-wrap; } 26 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 27 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Add here the files you want to convert. All the files will have the same properties applied. </span></p> 28 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> 29 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Don't forget to first convert the files to an oni compatible codec</span><span style=" font-size:8pt;">. More information </span><a href=" "><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">here</span></a><span style=" font-size:8pt;">.</span></p></body></html></string> 23 <string><html>Add here the files you want to convert. All the files will have the same properties applied.<br/>Don't forget to first convert the files to an oni compatible codec. More information <a href=" ">here.</a></html></string> 30 24 </property> 31 25 <property name="wordWrap"> … … 127 121 <string>Output converted files to:</string> 128 122 </property> 129 <layout class="QVBoxLayout" name="verticalLayout_ 3">123 <layout class="QVBoxLayout" name="verticalLayout_2"> 130 124 <item> 131 <layout class="QVBoxLayout" name="verticalLayout_2"> 125 <widget class="QRadioButton" name="rbWorkspace"> 126 <property name="text"> 127 <string>Workspace</string> 128 </property> 129 <property name="checked"> 130 <bool>true</bool> 131 </property> 132 </widget> 133 </item> 134 <item> 135 <layout class="QHBoxLayout" name="horizontalLayout_2"> 132 136 <item> 133 <widget class="QRadioButton" name="rbWorkspace"> 137 <widget class="QRadioButton" name="rbOther"> 138 <property name="enabled"> 139 <bool>true</bool> 140 </property> 134 141 <property name="text"> 135 <string>Workspace</string> 136 </property> 137 <property name="checked"> 138 <bool>true</bool> 142 <string>Other</string> 139 143 </property> 140 144 </widget> 141 145 </item> 142 146 <item> 143 <layout class="QHBoxLayout" name="horizontalLayout_2"> 144 <item> 145 <widget class="QRadioButton" name="rbOther"> 146 <property name="enabled"> 147 <bool>true</bool> 148 </property> 149 <property name="text"> 150 <string>Other</string> 151 </property> 152 </widget> 153 </item> 154 <item> 155 <widget class="QLineEdit" name="leOtherLocation"> 156 <property name="enabled"> 157 <bool>false</bool> 158 </property> 159 </widget> 160 </item> 161 <item> 162 <widget class="QPushButton" name="pbBrowserOtherLocation"> 163 <property name="enabled"> 164 <bool>false</bool> 165 </property> 166 <property name="text"> 167 <string>Browse...</string> 168 </property> 169 </widget> 170 </item> 171 </layout> 147 <widget class="QLineEdit" name="leOtherLocation"> 148 <property name="enabled"> 149 <bool>false</bool> 150 </property> 151 </widget> 152 </item> 153 <item> 154 <widget class="QPushButton" name="pbBrowserOtherLocation"> 155 <property name="enabled"> 156 <bool>false</bool> 157 </property> 158 <property name="text"> 159 <string>Browse...</string> 160 </property> 161 </widget> 172 162 </item> 173 163 </layout> -
Vago/trunk/Vago/soundWizard/soundpage3.ui
r771 r790 100 100 <string>Properties</string> 101 101 </property> 102 <layout class="QVBoxLayout" name="verticalLayout_3"> 103 <item> 104 <layout class="QHBoxLayout" name="horizontalLayout_2"> 105 <item> 106 <widget class="QLabel" name="label"> 107 <property name="minimumSize"> 108 <size> 109 <width>115</width> 110 <height>0</height> 111 </size> 112 </property> 113 <property name="text"> 114 <string>Sphere radious:</string> 115 </property> 116 </widget> 117 </item> 118 <item> 119 <widget class="QLineEdit" name="leSphereRadious"> 120 <property name="text"> 121 <string>10</string> 122 </property> 123 </widget> 124 </item> 125 </layout> 126 </item> 127 <item> 128 <layout class="QHBoxLayout" name="horizontalLayout_3"> 129 <item> 130 <widget class="QLabel" name="label_2"> 131 <property name="minimumSize"> 132 <size> 133 <width>115</width> 134 <height>0</height> 135 </size> 136 </property> 137 <property name="text"> 138 <string>Min elapsed time:</string> 139 </property> 140 </widget> 141 </item> 142 <item> 143 <widget class="QLineEdit" name="leMinElapsedTime"> 144 <property name="text"> 145 <string>1</string> 146 </property> 147 </widget> 148 </item> 149 </layout> 150 </item> 151 <item> 152 <layout class="QHBoxLayout" name="horizontalLayout_4"> 153 <item> 154 <widget class="QLabel" name="label_3"> 155 <property name="minimumSize"> 156 <size> 157 <width>115</width> 158 <height>0</height> 159 </size> 160 </property> 161 <property name="text"> 162 <string>Max elapsed time:</string> 163 </property> 164 </widget> 165 </item> 166 <item> 167 <widget class="QLineEdit" name="leMaxElapsedTime"> 168 <property name="text"> 169 <string>1</string> 170 </property> 171 </widget> 172 </item> 173 </layout> 174 </item> 175 <item> 176 <layout class="QHBoxLayout" name="horizontalLayout_5"> 177 <item> 178 <widget class="QLabel" name="label_4"> 179 <property name="minimumSize"> 180 <size> 181 <width>115</width> 182 <height>0</height> 183 </size> 184 </property> 185 <property name="text"> 186 <string>Min volume distance:</string> 187 </property> 188 </widget> 189 </item> 190 <item> 191 <widget class="QLineEdit" name="leMinVolumeDistance"> 192 <property name="text"> 193 <string>10</string> 194 </property> 195 </widget> 196 </item> 197 </layout> 198 </item> 199 <item> 200 <layout class="QHBoxLayout" name="horizontalLayout_6"> 201 <item> 202 <widget class="QLabel" name="label_5"> 203 <property name="minimumSize"> 204 <size> 205 <width>115</width> 206 <height>0</height> 207 </size> 208 </property> 209 <property name="text"> 210 <string>Max volume distance:</string> 211 </property> 212 </widget> 213 </item> 214 <item> 215 <widget class="QLineEdit" name="leMaxVolumeDistance"> 216 <property name="text"> 217 <string>50</string> 218 </property> 219 </widget> 220 </item> 221 </layout> 222 </item> 223 <item> 224 <layout class="QHBoxLayout" name="horizontalLayout_7"> 225 <item> 226 <widget class="QLabel" name="label_6"> 227 <property name="minimumSize"> 228 <size> 229 <width>115</width> 230 <height>0</height> 231 </size> 232 </property> 233 <property name="text"> 234 <string>Min occlusion:</string> 235 </property> 236 </widget> 237 </item> 238 <item> 239 <widget class="QLineEdit" name="leMinOcclusion"> 240 <property name="text"> 241 <string>3</string> 242 </property> 243 </widget> 244 </item> 245 </layout> 246 </item> 247 <item> 248 <layout class="QHBoxLayout" name="horizontalLayout_8"> 249 <item> 250 <widget class="QLabel" name="label_7"> 251 <property name="minimumSize"> 252 <size> 253 <width>115</width> 254 <height>0</height> 255 </size> 256 </property> 257 <property name="text"> 258 <string>Treshold:</string> 259 </property> 260 </widget> 261 </item> 262 <item> 263 <widget class="QLineEdit" name="leTreshold"> 264 <property name="text"> 265 <string>0</string> 266 </property> 267 </widget> 268 </item> 269 </layout> 102 <layout class="QFormLayout" name="formLayout"> 103 <item row="0" column="0"> 104 <widget class="QLabel" name="label"> 105 <property name="text"> 106 <string>Sphere radious:</string> 107 </property> 108 </widget> 109 </item> 110 <item row="0" column="1"> 111 <widget class="QLineEdit" name="leSphereRadious"> 112 <property name="text"> 113 <string>10</string> 114 </property> 115 </widget> 116 </item> 117 <item row="1" column="0"> 118 <widget class="QLabel" name="label_2"> 119 <property name="text"> 120 <string>Min elapsed time:</string> 121 </property> 122 </widget> 123 </item> 124 <item row="1" column="1"> 125 <widget class="QLineEdit" name="leMinElapsedTime"> 126 <property name="text"> 127 <string>1</string> 128 </property> 129 </widget> 130 </item> 131 <item row="2" column="0"> 132 <widget class="QLabel" name="label_3"> 133 <property name="text"> 134 <string>Max elapsed time:</string> 135 </property> 136 </widget> 137 </item> 138 <item row="2" column="1"> 139 <widget class="QLineEdit" name="leMaxElapsedTime"> 140 <property name="text"> 141 <string>1</string> 142 </property> 143 </widget> 144 </item> 145 <item row="3" column="0"> 146 <widget class="QLabel" name="label_4"> 147 <property name="text"> 148 <string>Min volume distance:</string> 149 </property> 150 </widget> 151 </item> 152 <item row="3" column="1"> 153 <widget class="QLineEdit" name="leMinVolumeDistance"> 154 <property name="text"> 155 <string>10</string> 156 </property> 157 </widget> 158 </item> 159 <item row="4" column="0"> 160 <widget class="QLabel" name="label_5"> 161 <property name="text"> 162 <string>Max volume distance:</string> 163 </property> 164 </widget> 165 </item> 166 <item row="4" column="1"> 167 <widget class="QLineEdit" name="leMaxVolumeDistance"> 168 <property name="text"> 169 <string>50</string> 170 </property> 171 </widget> 172 </item> 173 <item row="5" column="0"> 174 <widget class="QLabel" name="label_6"> 175 <property name="text"> 176 <string>Min occlusion:</string> 177 </property> 178 </widget> 179 </item> 180 <item row="5" column="1"> 181 <widget class="QLineEdit" name="leMinOcclusion"> 182 <property name="text"> 183 <string>3</string> 184 </property> 185 </widget> 186 </item> 187 <item row="6" column="0"> 188 <widget class="QLabel" name="label_7"> 189 <property name="text"> 190 <string>Treshold:</string> 191 </property> 192 </widget> 193 </item> 194 <item row="6" column="1"> 195 <widget class="QLineEdit" name="leTreshold"> 196 <property name="text"> 197 <string>0</string> 198 </property> 199 </widget> 270 200 </item> 271 201 </layout> -
Vago/trunk/Vago/soundWizard/soundpage4.ui
r771 r790 23 23 <string>Properties</string> 24 24 </property> 25 <layout class="QVBoxLayout" name="verticalLayout"> 26 <item> 27 <layout class="QHBoxLayout" name="horizontalLayout_2"> 28 <item> 29 <widget class="QLabel" name="label"> 30 <property name="minimumSize"> 31 <size> 32 <width>115</width> 33 <height>0</height> 34 </size> 35 </property> 36 <property name="text"> 37 <string>Volume:</string> 38 </property> 39 </widget> 40 </item> 41 <item> 42 <widget class="QLineEdit" name="leVolume"> 43 <property name="text"> 44 <string>1</string> 45 </property> 46 </widget> 47 </item> 48 </layout> 25 <layout class="QFormLayout" name="formLayout"> 26 <property name="fieldGrowthPolicy"> 27 <enum>QFormLayout::FieldsStayAtSizeHint</enum> 28 </property> 29 <item row="0" column="0"> 30 <widget class="QLabel" name="label"> 31 <property name="text"> 32 <string>Volume:</string> 33 </property> 34 </widget> 49 35 </item> 50 <item> 51 <layout class="QHBoxLayout" name="horizontalLayout_3"> 52 <item> 53 <widget class="QLabel" name="label_2"> 54 <property name="minimumSize"> 55 <size> 56 <width>115</width> 57 <height>0</height> 58 </size> 59 </property> 60 <property name="text"> 61 <string>Min volume:</string> 62 </property> 63 </widget> 64 </item> 65 <item> 66 <widget class="QLineEdit" name="leMinVolume"> 67 <property name="text"> 68 <string>1</string> 69 </property> 70 </widget> 71 </item> 72 </layout> 36 <item row="0" column="1"> 37 <widget class="QLineEdit" name="leVolume"> 38 <property name="text"> 39 <string>1</string> 40 </property> 41 </widget> 73 42 </item> 74 <item> 75 <layout class="QHBoxLayout" name="horizontalLayout_4"> 76 <item> 77 <widget class="QLabel" name="label_3"> 78 <property name="minimumSize"> 79 <size> 80 <width>115</width> 81 <height>0</height> 82 </size> 83 </property> 84 <property name="text"> 85 <string>Max volume:</string> 86 </property> 87 </widget> 88 </item> 89 <item> 90 <widget class="QLineEdit" name="leMaxVolume"> 91 <property name="text"> 92 <string>1</string> 93 </property> 94 </widget> 95 </item> 96 </layout> 43 <item row="1" column="0"> 44 <widget class="QLabel" name="label_2"> 45 <property name="text"> 46 <string>Min volume:</string> 47 </property> 48 </widget> 97 49 </item> 98 <item> 99 <layout class="QHBoxLayout" name="horizontalLayout_5"> 100 <item> 101 <widget class="QLabel" name="label_4"> 102 <property name="minimumSize"> 103 <size> 104 <width>115</width> 105 <height>0</height> 106 </size> 107 </property> 108 <property name="text"> 109 <string>Pitch:</string> 110 </property> 111 </widget> 112 </item> 113 <item> 114 <widget class="QLineEdit" name="lePitch"> 115 <property name="text"> 116 <string>1</string> 117 </property> 118 </widget> 119 </item> 120 </layout> 50 <item row="1" column="1"> 51 <widget class="QLineEdit" name="leMinVolume"> 52 <property name="text"> 53 <string>1</string> 54 </property> 55 </widget> 121 56 </item> 122 <item> 123 <layout class="QHBoxLayout" name="horizontalLayout_6"> 124 <item> 125 <widget class="QLabel" name="label_5"> 126 <property name="minimumSize"> 127 <size> 128 <width>115</width> 129 <height>0</height> 130 </size> 131 </property> 132 <property name="text"> 133 <string>Min pitch:</string> 134 </property> 135 </widget> 136 </item> 137 <item> 138 <widget class="QLineEdit" name="leMinPitch"> 139 <property name="text"> 140 <string>1</string> 141 </property> 142 </widget> 143 </item> 144 </layout> 57 <item row="2" column="0"> 58 <widget class="QLabel" name="label_3"> 59 <property name="text"> 60 <string>Max volume:</string> 61 </property> 62 </widget> 145 63 </item> 146 <item> 147 <layout class="QHBoxLayout" name="horizontalLayout_7"> 148 <item> 149 <widget class="QLabel" name="label_6"> 150 <property name="minimumSize"> 151 <size> 152 <width>115</width> 153 <height>0</height> 154 </size> 155 </property> 156 <property name="text"> 157 <string>Max pitch:</string> 158 </property> 159 </widget> 160 </item> 161 <item> 162 <widget class="QLineEdit" name="leMaxPitch"> 163 <property name="text"> 164 <string>1</string> 165 </property> 166 </widget> 167 </item> 168 </layout> 64 <item row="2" column="1"> 65 <widget class="QLineEdit" name="leMaxVolume"> 66 <property name="text"> 67 <string>1</string> 68 </property> 69 </widget> 169 70 </item> 170 <item> 171 <layout class="QHBoxLayout" name="horizontalLayout_8"> 172 <item> 173 <widget class="QLabel" name="label_7"> 174 <property name="minimumSize"> 175 <size> 176 <width>115</width> 177 <height>0</height> 178 </size> 179 </property> 180 <property name="text"> 181 <string>Weight:</string> 182 </property> 183 </widget> 184 </item> 185 <item> 186 <widget class="QLineEdit" name="leWeight"> 187 <property name="text"> 188 <string>10</string> 189 </property> 190 </widget> 191 </item> 192 </layout> 71 <item row="3" column="0"> 72 <widget class="QLabel" name="label_4"> 73 <property name="text"> 74 <string>Pitch:</string> 75 </property> 76 </widget> 193 77 </item> 194 <item> 78 <item row="3" column="1"> 79 <widget class="QLineEdit" name="lePitch"> 80 <property name="text"> 81 <string>1</string> 82 </property> 83 </widget> 84 </item> 85 <item row="4" column="0"> 86 <widget class="QLabel" name="label_5"> 87 <property name="text"> 88 <string>Min pitch:</string> 89 </property> 90 </widget> 91 </item> 92 <item row="4" column="1"> 93 <widget class="QLineEdit" name="leMinPitch"> 94 <property name="text"> 95 <string>1</string> 96 </property> 97 </widget> 98 </item> 99 <item row="5" column="0"> 100 <widget class="QLabel" name="label_6"> 101 <property name="text"> 102 <string>Max pitch:</string> 103 </property> 104 </widget> 105 </item> 106 <item row="5" column="1"> 107 <widget class="QLineEdit" name="leMaxPitch"> 108 <property name="text"> 109 <string>1</string> 110 </property> 111 </widget> 112 </item> 113 <item row="6" column="0"> 114 <widget class="QLabel" name="label_7"> 115 <property name="text"> 116 <string>Weight:</string> 117 </property> 118 </widget> 119 </item> 120 <item row="6" column="1"> 121 <widget class="QLineEdit" name="leWeight"> 122 <property name="text"> 123 <string>10</string> 124 </property> 125 </widget> 126 </item> 127 <item row="7" column="0" colspan="2"> 195 128 <widget class="QCheckBox" name="cbPreventRepeat"> 196 129 <property name="toolTip"> -
Vago/trunk/Vago/soundWizard/soundpagefinal.cpp
r771 r790 16 16 this->myXmlProcessor = new XmlProcessor(this->myLogger,this->xmlCommands); 17 17 this->myConverter = new Converter(this->myLogger,this->oniSplitCommands); 18 19 ui->lbComplete->setText("<html>The wizard is now complete. The sounds have been converted. " 20 "You can view all converted files clicking <a href=' '>here.</a><br />" 21 "<br />Click restart to create more sounds from the wizard beggining," 22 "otherwise click finish.</html>"); // Don't use rich text in qtdesigner because it generates platform dependent code 18 23 19 24 connectSlots(); -
Vago/trunk/Vago/soundWizard/soundpagefinal.ui
r771 r790 18 18 <widget class="QLabel" name="lbComplete"> 19 19 <property name="text"> 20 <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> 21 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> 22 p, li { white-space: pre-wrap; } 23 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> 24 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">The wizard is now complete. The sounds have been converted. You can view all converted files clicking </span><a href=" "><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">here</span></a><span style=" font-size:8pt;">.</span></p> 25 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></p> 26 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Click restart to create more sounds from the wizard beggining, otherwise click finish.</span></p></body></html></string> 20 <string><html>The wizard is now complete. The sounds have been converted. You can view all converted files clicking <a href=" ">here.</a><br /><br />Click restart to create more sounds from the wizard beggining, otherwise click finish.</html></string> 21 </property> 22 <property name="wordWrap"> 23 <bool>true</bool> 27 24 </property> 28 25 </widget> -
Vago/trunk/Vago/util.h
r771 r790 12 12 13 13 namespace GlobalVars{ 14 const QString AppVersion="0.8"; 15 const QString OniSplitExeName="OniSplit.exe"; 16 const QString XmlToolsExeName="xmlTools.exe"; 17 const QString AppLogName="logVago.txt"; 18 const QString BuiltOniSplitVersion="0.9.86.0"; 19 const QString BuiltXmlToolsVersion="0.8d"; 20 const QString ModsDomain="www.mods.oni2.net"; 21 const QString VagoNode = "247"; 22 const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json"; 23 const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode; 24 const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp"; 25 const QString HelpLocation=QDir::currentPath() + "/help"; 26 const char OniSplitProcSeparator=';'; 14 const QString AppVersion="0.8"; 15 const QString OniSplitString="OniSplit.exe"; 16 const QString XmlToolsString="xmlTools.exe"; 17 18 #ifdef Q_WS_WIN 19 const QString OniExe="Oni.exe"; 20 const QString OniSplitExeName=OniSplitString; 21 const QString XmlToolsExeName=XmlToolsString; 22 #else 23 const QString OniExe="Oni.app/Contents/MacOS/Oni"; 24 const QString OniSplitExeName="mono "+OniSplitString; // Mac uses mono to run .net applications 25 const QString XmlToolsExeName="mono "+XmlToolsString; 26 #endif 27 28 const QString AppLogName="logVago.txt"; 29 const QString BuiltOniSplitVersion="0.9.86.0"; 30 const QString BuiltXmlToolsVersion="0.8d"; 31 const QString ModsDomain="www.mods.oni2.net"; 32 const QString VagoNode = "247"; 33 const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json"; 34 const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode; 35 const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp"; 36 const QString HelpLocation=QDir::currentPath() + "/help"; 37 const char OniSplitProcSeparator=';'; 27 38 } 28 39 … … 31 42 **/ 32 43 namespace Util{ 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 44 QString normalizePath(QString path); 45 QString cutName(QString path); 46 QString insertQuotes(QString path); 47 QString normalizeAndQuote(QString path); 48 QString fullTrim(QString str); 49 QString normalizeDecimalSeparator(QString value); 50 QStringList multipleDirDialog(QString title); 51 QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive); 52 int indexOfBackward(QString myString, QString toSearch, int from = -1); 53 bool showQuestionPopUp(QWidget * parent, QString message); 54 bool checkEmptySpaces(QStringList toCheck); 55 bool checkIfDoubles(QStringList toCheck); 56 bool isStringInteger(QString myString); 57 bool isStringDouble(QString myString); 58 bool cpDir(const QString &srcPath, const QString &dstPath); 59 bool rmDir(const QString &dirPath); 60 bool removeDir(const QString &dirName); 61 void showPopUp(QString message); 62 void showRichPopUp(QString message); 63 void showWarningPopUp(QString message); 64 void showErrorPopUp(QString message); 65 void showErrorLogPopUp(QString message); 66 void showRichErrorPopUp(QString message); 67 void openLogFile(); 57 68 58 69 }
Note:
See TracChangeset
for help on using the changeset viewer.
