Merge commit 'fab6feec70b5a871469f8e808b8aa58dd93f1525'

sowicm · sowicm · commit e36b5837a942 · 2016-02-03T17:47:33.000+08:00
Conflicts:
	CMakeLists.txt
	LiteEditor/webupdatethread.cpp
	Runtime/rc/menu.xrc
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,12 +37,8 @@ project( "Sowicm's Codepad" )
 
 ## Generate compile_commands.json file for code completion
 set( CMAKE_EXPORT_COMPILE_COMMANDS 1 )
-
-if( UNIX AND NOT APPLE)
-    set( CMAKE_LIBRARY_ARCHITECTURE x86_64-linux-gnu ) # add search path needed by (at least) libssh and gtk2 libraries
-endif()
-
 set( CL_PREFIX "/usr" )
+
 if (CMAKE_CURRENT_LIST_DIR) # since cmake 2.8.3
     set( CL_SRC_ROOT ${CMAKE_CURRENT_LIST_DIR})
 else()
diff --git a/InnoSetup/codelite64_mingw.iss b/InnoSetup/codelite64_mingw.iss
@@ -5,15 +5,15 @@
 AppName=CodeLite
 AppVerName=CodeLite
 AppPublisher=Eran Ifrah
-AppVersion=9.1.0
+AppVersion=9.1.1
 AppPublisherURL=http://codelite.org
 AppSupportURL=http://codelite.org
 AppUpdatesURL=http://codelite.org
 DefaultDirName={pf64}\CodeLite
 DefaultGroupName=CodeLite
 LicenseFile=license.txt
 OutputDir=output
-OutputBaseFilename=codelite-amd64-9.1.0
+OutputBaseFilename=codelite-amd64-9.1.1
 ChangesEnvironment=yes
 FlatComponentsList=yes
 SetupIconFile=box_software.ico
diff --git a/InnoSetup/codelite_mingw.iss b/InnoSetup/codelite_mingw.iss
@@ -5,15 +5,15 @@
 AppName=CodeLite
 AppVerName=CodeLite
 AppPublisher=Eran Ifrah
-AppVersion=9.1.0
+AppVersion=9.1.1
 AppPublisherURL=http://codelite.org
 AppSupportURL=http://codelite.org
 AppUpdatesURL=http://codelite.org
 DefaultDirName={pf}\CodeLite
 DefaultGroupName=CodeLite
 LicenseFile=license.txt
 OutputDir=output
-OutputBaseFilename=codelite-x86-9.1.0
+OutputBaseFilename=codelite-x86-9.1.1
 ChangesEnvironment=yes
 FlatComponentsList=yes
 SetupIconFile=box_software.ico
diff --git a/LiteEditor.workspace b/LiteEditor.workspace
@@ -93,7 +93,7 @@
       <Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
       <Project Name="ZoomNavigator" ConfigName="Win_x86_Release"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="CMake_Release" Selected="no">
+    <WorkspaceConfiguration Name="CMake_Release" Selected="yes">
       <Environment/>
       <Project Name="ZoomNavigator" ConfigName="DebugUnicode"/>
       <Project Name="wxsqlite3" ConfigName="Win_x86_Release"/>
@@ -265,7 +265,7 @@
       <Project Name="WebTools" ConfigName="DebugUnicode"/>
       <Project Name="HelpPlugin" ConfigName="Win_x64_Debug"/>
     </WorkspaceConfiguration>
-    <WorkspaceConfiguration Name="Win_x64_Release" Selected="yes">
+    <WorkspaceConfiguration Name="Win_x64_Release" Selected="no">
       <Environment/>
       <Project Name="abbreviation" ConfigName="Win_x64_Release"/>
       <Project Name="CallGraph" ConfigName="Win_x64_Release"/>
diff --git a/LiteEditor/CMakeLists.txt b/LiteEditor/CMakeLists.txt
@@ -198,7 +198,13 @@ if(NOT APPLE)
         if (${WX_LIBSOUTPUT} MATCHES "^-L.+") # In recent, multi-architecture, distro versions it'll start with -L/foo/bar
             string(REGEX REPLACE "^-L([^ ;]+).*" "\\1" WX_LIBS_DIR ${WX_LIBSOUTPUT})
         else()
-            set(WX_LIBS_DIR "/usr/lib") # ${WX_LIBS_DIR} will be empty for older, non multi-architecture, distro versions that still use /usr/lib
+			# In recent fedoras, which do things with wx-config that might politely be described as 'strange,  wx-config doesn't emit -L/usr/lib64
+			find_file( USRLIBSIXTYFOUR "libwx_baseu-3.1.so" "/usr/lib64" )
+			if ( NOT USRLIBSIXTYFOUR MATCHES ".*NOTFOUND" )
+				set(WX_LIBS_DIR "/usr/lib64")
+			else()
+				set(WX_LIBS_DIR "/usr/lib") # ${WX_LIBS_DIR} will be empty for older, non multi-architecture, distro versions that still use /usr/lib
+			endif()
         endif()
         message("-- wxlibsdir is: ${WX_LIBS_DIR}")
 
@@ -210,9 +216,9 @@ if(NOT APPLE)
             # We want to replace -l with lib. We also want to exclude imaginary libs called _all.so, which buggy wx-config scripts can invent
             if (${ITEM} MATCHES "-lwx_.+" AND NOT ${ITEM} MATCHES "-l.+_all.+")
                 string(REGEX REPLACE "^-l" "lib" LIBITEM ${ITEM}) 
-                # openSUSE have started to use libwx_gtk2u_xrc-suse.so instead of libwx_gtk2u_xrc-3.1, so chop off the end
-                string(REGEX REPLACE "-.+" "-" LIBITEMCUT ${LIBITEM})
-                list(APPEND WX_LIBS_ALL ${WX_LIBS_DIR}/${LIBITEMCUT}*.so*) # we need the terminal [.]so because the rpms contain both dynamic and static libs
+                # openSUSE have started to use libwx_gtk2u_xrc-suse.so instead of libwx_gtk2u_xrc-3.1, so allow for extra text there
+                string(REGEX REPLACE "(libwx_[a-z0-9_]+-)(.+)" "\\1*\\2" LIBITEMADJ ${LIBITEM})
+                list(APPEND WX_LIBS_ALL ${WX_LIBS_DIR}/${LIBITEMADJ}*.so*) # we need the terminal [.]so because the rpms contain both dynamic and static libs
             endif()
         endforeach()
 
diff --git a/LiteEditor/autoversion.h b/LiteEditor/autoversion.h
@@ -26,7 +26,6 @@
 #ifndef CODELITE_AUTOVERSION_H
 #define CODELITE_AUTOVERSION_H
 
-#define CODELITE_VERSION_STRING "9.1.0"
-#define CODELITE_VERSION_NUMBER 909
+#define CODELITE_VERSION_STRING "9.1.1"
 
 #endif
diff --git a/LiteEditor/context_cpp.cpp b/LiteEditor/context_cpp.cpp
@@ -2664,12 +2664,14 @@ int ContextCpp::GetHyperlinkRange(int pos, int& start, int& end)
 
 void ContextCpp::GoHyperlink(int start, int end, int type, bool alt)
 {
+    (void) alt;
+
     if(type == XRCID("open_include_file")) {
         m_selectedWord = GetCtrl().GetTextRange(start, end);
         DoOpenWorkspaceFile();
     } else {
         if(type == XRCID("find_tag")) {
-            wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, alt ? XRCID("find_impl") : XRCID("find_decl"));
+            wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, XRCID("find_impl"));
             clMainFrame::Get()->GetEventHandler()->AddPendingEvent(e);
         }
     }
diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
@@ -187,8 +187,8 @@ EVT_IDLE(clMainFrame::OnIdle)
 EVT_ACTIVATE(clMainFrame::OnAppActivated)
 EVT_CLOSE(clMainFrame::OnClose)
 EVT_TIMER(FrameTimerId, clMainFrame::OnTimer)
-//	EVT_AUI_RENDER(Frame::OnAuiManagerRender)
-//	EVT_AUI_PANE_CLOSE(Frame::OnDockablePaneClosed)
+//  EVT_AUI_RENDER(Frame::OnAuiManagerRender)
+//  EVT_AUI_PANE_CLOSE(Frame::OnDockablePaneClosed)
 
 //---------------------------------------------------
 // File menu
@@ -293,6 +293,8 @@ EVT_MENU(XRCID("whitepsace_invisible"), clMainFrame::OnShowWhitespace)
 EVT_MENU(XRCID("whitepsace_always"), clMainFrame::OnShowWhitespace)
 EVT_MENU(XRCID("whitespace_visiable_after_indent"), clMainFrame::OnShowWhitespace)
 EVT_MENU(XRCID("whitespace_indent_only"), clMainFrame::OnShowWhitespace)
+EVT_MENU(XRCID("next_tab"), clMainFrame::OnNextTab)
+EVT_MENU(XRCID("prev_tab"), clMainFrame::OnPrevTab)
 EVT_MENU(XRCID("full_screen"), clMainFrame::OnShowFullScreen)
 EVT_MENU(XRCID("view_welcome_page"), clMainFrame::OnShowWelcomePage)
 EVT_MENU(XRCID("view_welcome_page_at_startup"), clMainFrame::OnLoadWelcomePage)
@@ -314,6 +316,8 @@ EVT_UPDATE_UI(XRCID("fold_all"), clMainFrame::OnFileExistUpdateUI)
 EVT_UPDATE_UI(XRCID("fold_all_in_selection"), clMainFrame::DispatchUpdateUIEvent)
 EVT_UPDATE_UI(XRCID("fold_topmost_in_selection"), clMainFrame::DispatchUpdateUIEvent)
 EVT_UPDATE_UI(XRCID("display_eol"), clMainFrame::OnViewDisplayEOL_UI)
+EVT_UPDATE_UI(XRCID("next_tab"), clMainFrame::OnNextPrevTab_UI)
+EVT_UPDATE_UI(XRCID("prev_tab"), clMainFrame::OnNextPrevTab_UI)
 EVT_UPDATE_UI(XRCID("whitepsace_invisible"), clMainFrame::OnShowWhitespaceUI)
 EVT_UPDATE_UI(XRCID("whitepsace_always"), clMainFrame::OnShowWhitespaceUI)
 EVT_UPDATE_UI(XRCID("whitespace_visiable_after_indent"), clMainFrame::OnShowWhitespaceUI)
@@ -778,6 +782,18 @@ clMainFrame::clMainFrame(
         "selection_to_multi_caret", "Ctrl-Shift-L", _("Edit::Split selection into multiple carets"));
     clKeyboardManager::Get()->AddGlobalAccelerator(
         "incremental_replace", "", _("Search::Toggle the Quick-Replace Bar"));
+    clKeyboardManager::Get()->AddGlobalAccelerator(
+        "copy_file_relative_path_to_workspace", "Ctrl-Alt-Shift-C", "Edit::Copy Path Relative to Clipboard");
+    clKeyboardManager::Get()->AddGlobalAccelerator(
+        "copy_file_name", "", "Edit::Copy Path to Clipboard");
+    clKeyboardManager::Get()->AddGlobalAccelerator(
+        "copy_file_path", "", "Edit::Copy Full Path to Clipboard");
+    clKeyboardManager::Get()->AddGlobalAccelerator(
+        "copy_file_name_only", "", "Edit::Copy File Name to Clipboard");
+    clKeyboardManager::Get()->AddGlobalAccelerator(
+        "open_shell_from_filepath", "Ctrl-Shift-T", "Search::Open Shell From File Path");
+    clKeyboardManager::Get()->AddGlobalAccelerator(
+        "open_file_explorer", "Ctrl-Alt-Shift-T", "Search::Open Containing Folder");
 }
 
 clMainFrame::~clMainFrame(void)
@@ -3301,7 +3317,7 @@ void clMainFrame::CreateWelcomePage()
     content.Replace(wxT("$(FilesTable)"), filesTable);
 
     //replace the HTML colours with platfroms correct colours
-    wxColour active_caption 	= wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION);
+    wxColour active_caption     = wxSystemSettings::GetColour(wxSYS_COLOUR_ACTIVECAPTION);
     wxColour active_caption_txt = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
 
     active_caption = DrawingUtils::LightColour(active_caption, 11.0);
@@ -4625,6 +4641,50 @@ void clMainFrame::OnShowWhitespace(wxCommandEvent& e)
     EditorConfigST::Get()->SetOptions(options);
 }
 
+void clMainFrame::OnNextTab(wxCommandEvent& e)
+{
+    int idx = GetMainBook()->GetCurrentPageIndex();
+
+    if (idx != wxNOT_FOUND) {
+        clTab::Vec_t tabs;
+        GetMainBook()->GetAllTabs(tabs);
+
+        idx = (idx + 1) % tabs.size();
+        GetMainBook()->SelectPage(GetMainBook()->GetPage(idx));
+    }
+}
+
+void clMainFrame::OnPrevTab(wxCommandEvent& e)
+{
+    int idx = GetMainBook()->GetCurrentPageIndex();
+
+    if (idx != wxNOT_FOUND) {
+        idx--;
+
+        if (idx < 0) {
+            clTab::Vec_t tabs;
+            GetMainBook()->GetAllTabs(tabs);
+
+            idx = tabs.size() - 1;
+        }
+
+        GetMainBook()->SelectPage(GetMainBook()->GetPage(idx));
+    }
+}
+
+void clMainFrame::OnNextPrevTab_UI(wxUpdateUIEvent& e)
+{
+    CHECK_SHUTDOWN();
+    LEditor* editor = GetMainBook()->GetActiveEditor();
+    bool hasEditor = editor ? true : false;
+    if(!hasEditor) {
+        e.Enable(false);
+        return;
+    }
+
+    e.Enable(true);
+}
+
 void clMainFrame::OnIncrementalSearch(wxCommandEvent& event)
 {
     wxUnusedVar(event);
diff --git a/LiteEditor/frame.h b/LiteEditor/frame.h
@@ -131,7 +131,7 @@ class clMainFrame : public wxFrame
     void DoCreateBuildDropDownMenu(wxMenu* menu);
     void DoShowToolbars(bool show);
     void InitializeLogo();
-    
+
 public:
     static clMainFrame* Get();
     static void Initialize(bool loadLastSession);
@@ -559,6 +559,9 @@ class clMainFrame : public wxFrame
     void OnSyntaxHighlight(wxCommandEvent& e);
     void OnShowWhitespaceUI(wxUpdateUIEvent& e);
     void OnShowWhitespace(wxCommandEvent& e);
+    void OnNextTab(wxCommandEvent& e);
+    void OnPrevTab(wxCommandEvent& e);
+    void OnNextPrevTab_UI(wxUpdateUIEvent& e);
     void OnShowFullScreen(wxCommandEvent& e);
     void OnFindResourceXXX(wxCommandEvent& e);
     void OnShowActiveProjectSettings(wxCommandEvent& e);
@@ -584,6 +587,7 @@ class clMainFrame : public wxFrame
     void OnSettingsChanged(wxCommandEvent& e);
     void OnEditMenuOpened(wxMenuEvent& e);
     void OnProjectRenamed(clCommandEvent& event);
+
     DECLARE_EVENT_TABLE()
 };
 
diff --git a/LiteEditor/mainbook.cpp b/LiteEditor/mainbook.cpp
@@ -1213,6 +1213,7 @@ void MainBook::DoUpdateNotebookTheme()
 }
 
 wxWindow* MainBook::GetCurrentPage() { return m_book->GetCurrentPage(); }
+int MainBook::GetCurrentPageIndex() { return m_book->GetSelection(); }
 
 void MainBook::OnClosePage(wxBookCtrlEvent& e)
 {
diff --git a/LiteEditor/mainbook.h b/LiteEditor/mainbook.h
@@ -53,7 +53,7 @@ class MainBook : public wxPanel
     bool m_isWorkspaceReloading;
     bool m_reloadingDoRaise; // Prevents multiple Raises() during RestoreSession()
     FilesModifiedDlg* m_filesModifiedDlg;
-    
+
 public:
     enum {
         kGetAll_Default = 0x00000000,         // booked editors only
@@ -68,7 +68,7 @@ class MainBook : public wxPanel
     void ConnectEvents();
     void DoUpdateNotebookTheme();
     void DoOpenImageViewer(const wxFileName& filename);
-    
+
     void OnMouseDClick(wxBookCtrlEvent& e);
     void OnTabDClicked(wxBookCtrlEvent& e);
     void OnTabLabelContextMenu(wxBookCtrlEvent& e);
@@ -145,6 +145,7 @@ class MainBook : public wxPanel
     bool CloseEditor(const wxString& fileName) { return ClosePage(FindEditor(fileName)); }
 
     wxWindow* GetCurrentPage();
+    int GetCurrentPageIndex();
     wxWindow* GetPage(size_t page);
     size_t GetPageCount() const;
     wxWindow* FindPage(const wxString& text);
diff --git a/LiteEditor/webupdatethread.cpp b/LiteEditor/webupdatethread.cpp
@@ -36,7 +36,8 @@ const wxEventType wxEVT_CMD_VERSION_UPTODATE = wxNewEventType();
 
 static const size_t DLBUFSIZE = 4096;
 
-struct CodeLiteVersion {
+struct CodeLiteVersion
+{
     wxString m_os;
     wxString m_codename;
     wxString m_arch;
@@ -58,8 +59,13 @@ struct CodeLiteVersion {
      */
     bool IsNewer(const wxString& os, const wxString& codename, const wxString& arch) const
     {
+        wxString strVersionNumer = CODELITE_VERSION_STRING;
+        strVersionNumer.Replace(".", "");
+        long nVersionNumber = -1;
+        strVersionNumer.ToCLong(&nVersionNumber);
+
         if((m_os == os) && (m_arch == arch) && (m_codename == codename)) {
-            return (m_version > CODELITE_VERSION_NUMBER);
+            return (m_version > nVersionNumber);
         }
         return false;
     }
@@ -178,13 +184,13 @@ void WebUpdateJob::ParseFile()
         CodeLiteVersion v(platforms.arrayItem(i));
         if(v.IsNewer(os, codename, arch)) {
             wxCommandEvent event(wxEVT_CMD_NEW_VERSION_AVAILABLE);
-            event.SetClientData(
-                new WebUpdateJobData("http://31.baidu.com/support.php", v.GetUrl(), CODELITE_VERSION_STRING, "", false, true));
+            event.SetClientData(new WebUpdateJobData(
+                "http://31.baidu.com/support.php", v.GetUrl(), CODELITE_VERSION_STRING, "", false, true));
             m_parent->AddPendingEvent(event);
             return;
         }
     }
-    
+
     if(m_userRequest) {
         // If we got here, then the version is up to date
         wxCommandEvent event(wxEVT_CMD_VERSION_UPTODATE);
diff --git a/Plugin/builder_gnumake.cpp b/Plugin/builder_gnumake.cpp
@@ -1806,9 +1806,9 @@ wxString BuilderGnuMake::DoGetCompilerMacro(const wxString& filename)
 
 wxString BuilderGnuMake::DoGetTargetPrefix(const wxFileName& filename, const wxString& cwd, CompilerPtr cmp)
 {
-    size_t count = filename.GetDirCount();
     const wxArrayString& dirs = filename.GetDirs();
     wxString lastDir;
+    wxString ret;
 
     if(cwd == filename.GetPath()) return wxEmptyString;
 
@@ -1818,8 +1818,11 @@ wxString BuilderGnuMake::DoGetTargetPrefix(const wxFileName& filename, const wxS
         return wxEmptyString;
     }
 
-    if(count) {
-        lastDir = dirs.Item(count - 1);
+    // remove cwd from filename
+    int start = wxFileName(cwd).GetDirCount();
+
+    for(size_t i=start+1; i < filename.GetDirCount(); i++) {
+        lastDir = dirs.Item(i);
 
         // Handle special directory paths
         if(lastDir == wxT("..")) {
@@ -1832,9 +1835,11 @@ wxString BuilderGnuMake::DoGetTargetPrefix(const wxFileName& filename, const wxS
         if(lastDir.IsEmpty() == false) {
             lastDir << wxT("_");
         }
+
+        ret += lastDir;
     }
 
-    return lastDir;
+    return ret;
 }
 
 wxString BuilderGnuMake::DoGetMarkerFileDir(const wxString& projname, const wxString& projectPath)
diff --git a/Plugin/configtool.cpp b/Plugin/configtool.cpp
@@ -30,6 +30,7 @@
 #include "wx/ffile.h"
 #include "editor_config.h"
 #include "wx_xml_compatibility.h"
+#include "globals.h"
 
 ConfigTool::ConfigTool()
     : m_fileName(wxEmptyString)
@@ -64,7 +65,7 @@ bool ConfigTool::WriteObject(const wxString &name, SerializedObject *obj)
 
     if(!XmlUtils::StaticWriteObject(m_doc.GetRoot(), name, obj))
         return false;
-    return m_doc.Save(m_fileName);
+    return ::SaveXmlToFile(&m_doc, m_fileName);
 }
 
 bool ConfigTool::ReadObject(const wxString &name, SerializedObject *obj)
diff --git a/Plugin/configurationtoolbase.cpp b/Plugin/configurationtoolbase.cpp
diff --git a/Runtime/config/accelerators.conf.default b/Runtime/config/accelerators.conf.default

Original file line number	Diff line number	Diff line change
`@@ -2664,12 +2664,14 @@ int ContextCpp::GetHyperlinkRange(int pos, int& start, int& end)`
`2664`	`2664`
`2665`	`2665`	`void ContextCpp::GoHyperlink(int start, int end, int type, bool alt)`
`2666`	`2666`	`{`
	`2667`	`+ (void) alt;`
	`2668`	`+`
`2667`	`2669`	`if(type == XRCID("open_include_file")) {`
`2668`	`2670`	`m_selectedWord = GetCtrl().GetTextRange(start, end);`
`2669`	`2671`	`DoOpenWorkspaceFile();`
`2670`	`2672`	`} else {`
`2671`	`2673`	`if(type == XRCID("find_tag")) {`
`2672`		`- wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, alt ? XRCID("find_impl") : XRCID("find_decl"));`
	`2674`	`+ wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, XRCID("find_impl"));`
`2673`	`2675`	`clMainFrame::Get()->GetEventHandler()->AddPendingEvent(e);`
`2674`	`2676`	`}`
`2675`	`2677`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1213,6 +1213,7 @@ void MainBook::DoUpdateNotebookTheme()`
`1213`	`1213`	`}`
`1214`	`1214`
`1215`	`1215`	`wxWindow* MainBook::GetCurrentPage() { return m_book->GetCurrentPage(); }`
	`1216`	`+int MainBook::GetCurrentPageIndex() { return m_book->GetSelection(); }`
`1216`	`1217`
`1217`	`1218`	`void MainBook::OnClosePage(wxBookCtrlEvent& e)`
`1218`	`1219`	`{`