diff -Nru jsstudio-0.1/debian/bzr-builder.manifest jsstudio-0.1/debian/bzr-builder.manifest --- jsstudio-0.1/debian/bzr-builder.manifest 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/debian/bzr-builder.manifest 2011-11-12 23:21:51.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~108 -lp:jsstudio revid:admin@quickmediasolutions.com-20111013035859-145m5h880a7d67ko +# bzr-builder format 0.3 deb-version {debupstream}-0~109 +lp:jsstudio revid:admin@quickmediasolutions.com-20111112182109-1ng2j3f1jwrjdusx diff -Nru jsstudio-0.1/debian/changelog jsstudio-0.1/debian/changelog --- jsstudio-0.1/debian/changelog 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/debian/changelog 2011-11-12 23:21:51.000000000 +0000 @@ -1,8 +1,8 @@ -jsstudio (0.1-0~108~lucid1) natty; urgency=low +jsstudio (0.1-0~109~lucid1) natty; urgency=low * Auto build. - -- George Edison Thu, 13 Oct 2011 04:39:12 +0000 + -- George Edison Sat, 12 Nov 2011 23:21:51 +0000 jsstudio (0.1-1) natty; urgency=low diff -Nru jsstudio-0.1/include/main/CMainWindow.h jsstudio-0.1/include/main/CMainWindow.h --- jsstudio-0.1/include/main/CMainWindow.h 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/include/main/CMainWindow.h 2011-11-12 23:21:51.000000000 +0000 @@ -124,6 +124,7 @@ //-------------- void OnCloseFile(); void OnCloseProject(); + void OnCloseAll(); //-------------- void OnExit(); diff -Nru jsstudio-0.1/resource/CAboutDialog.ui jsstudio-0.1/resource/CAboutDialog.ui --- jsstudio-0.1/resource/CAboutDialog.ui 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/resource/CAboutDialog.ui 2011-11-12 23:21:51.000000000 +0000 @@ -1,130 +1,128 @@ - - - CAboutDialog - - - - 0 - 0 - 484 - 182 - - - - About JS Studio - - - - 0 - - - - - - - - 0 - 0 - - - - - 148 - 128 - - - - background-image: url(:/images/logo.png); -margin-right: 20px; - - - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<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:16pt; font-weight:600;">JS Studio</span><br /><span style=" font-style:italic;">An open source IDE for JavaScript development.</span><br /><br />Copyright 2011 - Nathan Osman<br />This program is released under the GPLv3 license.</p></body></html> - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Qt::Horizontal - - - - - - - 3 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - OK - - - - - - - - - - - pushButton - clicked() - CAboutDialog - accept() - - - 431 - 159 - - - 241 - 91 - - - - - + + + CAboutDialog + + + + 0 + 0 + + + + About JS Studio + + + + 0 + + + + + + + + 0 + 0 + + + + + 148 + 128 + + + + background-image: url(:/images/logo.png); +margin-right: 20px; + + + + + + + + + + + + <h2 style="margin: 0px;">JS Studio</h2> +<i>An open source IDE for JavaScript development.</i> +<br /><br /> +Copyright 2011 - Nathan Osman<br /> +This program is released under the GPLv3 license. + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Qt::Horizontal + + + + + + + 3 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + OK + + + + + + + + + + + pushButton + clicked() + CAboutDialog + accept() + + + 431 + 159 + + + 241 + 91 + + + + + diff -Nru jsstudio-0.1/resource/CFindTextDialog.ui jsstudio-0.1/resource/CFindTextDialog.ui --- jsstudio-0.1/resource/CFindTextDialog.ui 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/resource/CFindTextDialog.ui 2011-11-12 23:21:51.000000000 +0000 @@ -1,142 +1,142 @@ - - - CFindTextDialog - - - - 0 - 0 - 407 - 166 - - - - - 0 - 0 - - - - Find Text - - - - - - - - Search Text: - - - - - - - - 0 - 0 - - - - - 300 - 0 - - - - - - - - - - Search Backwards - - - - - - - Case Sensitive - - - - - - - Match Whole Word Only - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Find Next - - - - - - - Close - - - - - - - - - - - FindNext - clicked() - CFindTextDialog - OnFindNext() - - - 303 - 132 - - - 223 - 77 - - - - - Close - clicked() - CFindTextDialog - close() - - - 394 - 132 - - - 223 - 77 - - - - - - OnFindNext() - - + + + CFindTextDialog + + + + 0 + 0 + 387 + 145 + + + + + 0 + 0 + + + + Find Text + + + + + + + + Search Text: + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + + + + + + Search Backwards + + + + + + + Case Sensitive + + + + + + + Match Whole Word Only + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Find Next + + + + + + + Close + + + + + + + + + + + FindNext + clicked() + CFindTextDialog + OnFindNext() + + + 303 + 132 + + + 223 + 77 + + + + + Close + clicked() + CFindTextDialog + close() + + + 394 + 132 + + + 223 + 77 + + + + + + OnFindNext() + + diff -Nru jsstudio-0.1/resource/CMainWindow.ui jsstudio-0.1/resource/CMainWindow.ui --- jsstudio-0.1/resource/CMainWindow.ui 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/resource/CMainWindow.ui 2011-11-12 23:21:51.000000000 +0000 @@ -1,729 +1,752 @@ - - - CMainWindow - - - - 0 - 0 - 733 - 443 - - - - JS Studio - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Qt::Horizontal - - - false - - - - true - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 0 - 0 - - - - - - - QTabWidget::South - - - 0 - - - - Files - - - - - - - 0 - 0 - - - - - Project - - - - - - - - - Symbols - - - - - - - Symbols - - - - - - - - - - - 1 - 0 - - - - - - - -1 - - - false - - - true - - - true - - - - - - - - - - 0 - 0 - 733 - 25 - - - - - File - - - - New - - - - - - - Open Recent - - - - - - - - - - - - - - - - - Edit - - - - - - - - - - - - Window - - - - - Help - - - - - - Tools - - - - - - Addons - - - - - - Search - - - - - - - - - - - - - - toolBar - - - TopToolBarArea - - - false - - - - - - About JS Studio - - - - - Source File - - - Ctrl+N - - - - - Project - - - - - Exit - - - - - Open... - - - Ctrl+O - - - - - Save - - - Ctrl+S - - - - - Save As... - - - - - Save All - - - Ctrl+Shift+S - - - - - Close File - - - Ctrl+F4 - - - - - Close Project - - - - - Cut - - - Ctrl+X - - - - - Copy - - - Ctrl+C - - - - - Paste - - - Ctrl+V - - - - - Select All - - - Ctrl+A - - - - - Undo - - - Ctrl+Z - - - - - Redo - - - Ctrl+Shift+Z - - - - - Clear List - - - - - Preferences - - - - - Addon Manager... - - - - - Find in Current File... - - - Ctrl+F - - - - - - - CProjectTreeWidget - QTreeWidget -

include/project/CProjectTreeWidget.h

- - - - - - NewSourceFile - activated() - CMainWindow - OnNewFile() - - - -1 - -1 - - - 313 - 219 - - - - - Open - activated() - CMainWindow - OnOpen() - - - -1 - -1 - - - 313 - 219 - - - - - Save - activated() - CMainWindow - OnSave() - - - -1 - -1 - - - 313 - 219 - - - - - SaveAs - activated() - CMainWindow - OnSaveAs() - - - -1 - -1 - - - 313 - 219 - - - - - SaveAll - activated() - CMainWindow - OnSaveAll() - - - -1 - -1 - - - 313 - 219 - - - - - CloseFile - activated() - CMainWindow - OnCloseFile() - - - -1 - -1 - - - 313 - 219 - - - - - Exit - activated() - CMainWindow - OnExit() - - - -1 - -1 - - - 313 - 219 - - - - - Undo - activated() - CMainWindow - OnUndo() - - - -1 - -1 - - - 313 - 219 - - - - - Redo - activated() - CMainWindow - OnRedo() - - - -1 - -1 - - - 313 - 219 - - - - - Cut - activated() - CMainWindow - OnCut() - - - -1 - -1 - - - 313 - 219 - - - - - Copy - activated() - CMainWindow - OnCopy() - - - -1 - -1 - - - 313 - 219 - - - - - Paste - activated() - CMainWindow - OnPaste() - - - -1 - -1 - - - 313 - 219 - - - - - SelectAll - activated() - CMainWindow - OnSelectAll() - - - -1 - -1 - - - 313 - 219 - - - - - NewProject - activated() - CMainWindow - OnNewProject() - - - -1 - -1 - - - 366 - 221 - - - - - CloseProject - activated() - CMainWindow - OnCloseProject() - - - -1 - -1 - - - 366 - 221 - - - - - ClearList - activated() - CMainWindow - OnClearRecent() - - - -1 - -1 - - - 366 - 221 - - - - - Preferences - activated() - CMainWindow - OnPreferences() - - - -1 - -1 - - - 366 - 221 - - - - - About - activated() - CMainWindow - OnAbout() - - - -1 - -1 - - - 366 - 221 - - - - - AddonManager - activated() - CMainWindow - OnAddonManager() - - - -1 - -1 - - - 366 - 221 - - - - - FindCurrentFile - activated() - CMainWindow - OnFindCurrentFile() - - - -1 - -1 - - - 366 - 221 - - - - - - OnNewFile() - OnNewProject() - OnOpen() - OnSave() - OnSaveAs() - OnSaveAll() - OnCloseFile() - OnCloseProject() - OnExit() - OnUndo() - OnRedo() - OnCut() - OnCopy() - OnPaste() - OnSelectAll() - OnClearRecent() - OnPreferences() - OnAbout() - OnAddonManager() - OnFindCurrentFile() - - + + + CMainWindow + + + + 0 + 0 + 733 + 443 + + + + JS Studio + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Qt::Horizontal + + + false + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + + + + QTabWidget::South + + + 0 + + + + Files + + + + + + + 0 + 0 + + + + + Project + + + + + + + + + Symbols + + + + + + + Symbols + + + + + + + + + + + 1 + 0 + + + + + + + -1 + + + false + + + true + + + true + + + + + + + + + + 0 + 0 + 733 + 20 + + + + + File + + + + New + + + + + + + Open Recent + + + + + + + + + + + + + + + + + + Edit + + + + + + + + + + + + Window + + + + + Help + + + + + + Tools + + + + + + Addons + + + + + + Search + + + + + + + + + + + + + + toolBar + + + TopToolBarArea + + + false + + + + + + About JS Studio + + + + + Source File + + + Ctrl+N + + + + + Project + + + + + Exit + + + + + Open... + + + Ctrl+O + + + + + Save + + + Ctrl+S + + + + + Save As... + + + + + Save All + + + Ctrl+Shift+S + + + + + Close File + + + Ctrl+F4 + + + + + Close Project + + + + + Cut + + + Ctrl+X + + + + + Copy + + + Ctrl+C + + + + + Paste + + + Ctrl+V + + + + + Select All + + + Ctrl+A + + + + + Undo + + + Ctrl+Z + + + + + Redo + + + Ctrl+Shift+Z + + + + + Clear List + + + + + Preferences + + + + + Addon Manager... + + + + + Find in Current File... + + + Ctrl+F + + + + + Close All + + + + + + + CProjectTreeWidget + QTreeWidget +

include/project/CProjectTreeWidget.h

+ + + + + + NewSourceFile + triggered() + CMainWindow + OnNewFile() + + + -1 + -1 + + + 313 + 219 + + + + + Open + triggered() + CMainWindow + OnOpen() + + + -1 + -1 + + + 313 + 219 + + + + + Save + triggered() + CMainWindow + OnSave() + + + -1 + -1 + + + 313 + 219 + + + + + SaveAs + triggered() + CMainWindow + OnSaveAs() + + + -1 + -1 + + + 313 + 219 + + + + + SaveAll + triggered() + CMainWindow + OnSaveAll() + + + -1 + -1 + + + 313 + 219 + + + + + CloseFile + triggered() + CMainWindow + OnCloseFile() + + + -1 + -1 + + + 313 + 219 + + + + + Exit + triggered() + CMainWindow + OnExit() + + + -1 + -1 + + + 313 + 219 + + + + + Undo + triggered() + CMainWindow + OnUndo() + + + -1 + -1 + + + 313 + 219 + + + + + Redo + triggered() + CMainWindow + OnRedo() + + + -1 + -1 + + + 313 + 219 + + + + + Cut + triggered() + CMainWindow + OnCut() + + + -1 + -1 + + + 313 + 219 + + + + + Copy + triggered() + CMainWindow + OnCopy() + + + -1 + -1 + + + 313 + 219 + + + + + Paste + triggered() + CMainWindow + OnPaste() + + + -1 + -1 + + + 313 + 219 + + + + + SelectAll + triggered() + CMainWindow + OnSelectAll() + + + -1 + -1 + + + 313 + 219 + + + + + NewProject + triggered() + CMainWindow + OnNewProject() + + + -1 + -1 + + + 366 + 221 + + + + + CloseProject + triggered() + CMainWindow + OnCloseProject() + + + -1 + -1 + + + 366 + 221 + + + + + ClearList + triggered() + CMainWindow + OnClearRecent() + + + -1 + -1 + + + 366 + 221 + + + + + Preferences + triggered() + CMainWindow + OnPreferences() + + + -1 + -1 + + + 366 + 221 + + + + + About + triggered() + CMainWindow + OnAbout() + + + -1 + -1 + + + 366 + 221 + + + + + AddonManager + triggered() + CMainWindow + OnAddonManager() + + + -1 + -1 + + + 366 + 221 + + + + + FindCurrentFile + triggered() + CMainWindow + OnFindCurrentFile() + + + -1 + -1 + + + 366 + 221 + + + + + CloseAll + triggered() + CMainWindow + OnCloseAll() + + + -1 + -1 + + + 366 + 221 + + + + + + OnNewFile() + OnNewProject() + OnOpen() + OnSave() + OnSaveAs() + OnSaveAll() + OnCloseFile() + OnCloseProject() + OnExit() + OnUndo() + OnRedo() + OnCut() + OnCopy() + OnPaste() + OnSelectAll() + OnClearRecent() + OnPreferences() + OnAbout() + OnAddonManager() + OnFindCurrentFile() + OnCloseAll() + + diff -Nru jsstudio-0.1/src/main/CMainWindow.cpp jsstudio-0.1/src/main/CMainWindow.cpp --- jsstudio-0.1/src/main/CMainWindow.cpp 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/src/main/CMainWindow.cpp 2011-11-12 23:21:51.000000000 +0000 @@ -539,6 +539,17 @@ ui->ProjectTree->CloseProject(); } +void CMainWindow::OnCloseAll() +{ + // Close each tab + for(int i=(ui->Tabbar->count() - 1);i >= 0;--i) + CloseTab(ui->Tabbar->widget(i)); + + // If there are no open tabs left, close the project + if(!ui->Tabbar->count()) + OnCloseProject(); +} + void CMainWindow::OnExit() { Quit(); diff -Nru jsstudio-0.1/src/project/CProjectTreeWidget.cpp jsstudio-0.1/src/project/CProjectTreeWidget.cpp --- jsstudio-0.1/src/project/CProjectTreeWidget.cpp 2011-10-13 04:39:12.000000000 +0000 +++ jsstudio-0.1/src/project/CProjectTreeWidget.cpp 2011-11-12 23:21:51.000000000 +0000 @@ -380,7 +380,7 @@ /// Closes the current project void CProjectTreeWidget::CloseProject() { - // Close any open projecto + // Close any open project if(m_project) { // Remove the items in the tree