[4Pane] initial commit
Mamoru TASAKA
mtasaka at fedoraproject.org
Fri Dec 12 14:17:40 UTC 2014
commit adb72cf7840dead7b1c76f4c183adaa84e3891b8
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Fri Dec 12 23:17:47 2014 +0900
initial commit
.gitignore | 1 +
...g-a-pointer-to-a-menubar-menu-don-t-searc.patch | 167 ++++++++++++++++++++
4Pane.spec | 104 ++++++++++++
sources | 1 +
4 files changed, 273 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..7c4d871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/4pane-3.0.tar.gz
diff --git a/4Pane-HEAD-0001-When-getting-a-pointer-to-a-menubar-menu-don-t-searc.patch b/4Pane-HEAD-0001-When-getting-a-pointer-to-a-menubar-menu-don-t-searc.patch
new file mode 100644
index 0000000..5b24902
--- /dev/null
+++ b/4Pane-HEAD-0001-When-getting-a-pointer-to-a-menubar-menu-don-t-searc.patch
@@ -0,0 +1,167 @@
+From 5b4ce2be04f00e001bad6c4d6c59ff3791b1125c Mon Sep 17 00:00:00 2001
+From: dghart <dghart at users.sourceforge.net>
+Date: Wed, 10 Dec 2014 20:42:12 +0000
+Subject: [PATCH] When getting a pointer to a menubar menu, don't search by
+ title
+
+Using wxMenuBar::FindMenu to find the index of a menu isn't as mnemonic-safe as it should be. There are two problems:
+1) If the search string isn't localised, it will fail if there's a translation.
+2) Even if it is, there's a potential problem with mnemonic location, as translators are allowed to use a non-default letter.
+
+This _shouldn't_ matter as wx removes the mnemonic before matching. However it seems that in Japanese, the mnemonic is appended
+(e.g. Bookmarks(&B))
+and unsurprisingly wxStripMenuCodes() can't cope with this. So store the position while loading the menubar; which isn't elegant, but it is safe.
+---
+ Accelerators.cpp | 4 ++++
+ Bookmarks.cpp | 13 +++++++++----
+ Bookmarks.h | 5 ++++-
+ Tools.cpp | 14 ++++++++------
+ Tools.h | 3 +++
+ 5 files changed, 28 insertions(+), 11 deletions(-)
+
+diff --git a/Accelerators.cpp b/Accelerators.cpp
+index eb75627..d470c91 100644
+--- a/Accelerators.cpp
++++ b/Accelerators.cpp
+@@ -16,6 +16,7 @@
+
+ #include "Externs.h"
+ #include "Configure.h"
++#include "Bookmarks.h"
+ #include "Accelerators.h"
+
+
+@@ -490,6 +491,9 @@ subitemslistarray[0] = columnitems; subitemslistcount[0] = sizeof(columnitems)/p
+
+ // Make arrays for menus & for submenus
+ const wxString menutitles[] = { _("&File"), _("&Edit"), _("&View"), _("&Tabs"), _("&Bookmarks"), _("&Archive"), _("&Mount"), _("Too&ls"), _("&Options"), _("&Help") };
++Bookmarks::SetMenuIndex(4); // *** remember to change these if their position changes! ***
++LaunchMiscTools::SetMenuIndex(7);
++
+ const wxString submenutitles[] = { _("&Columns to Display"), _("&Load a Tab Template") };
+ int submenID[2]; submenID[0] = SHCUT_FINISH + 1; submenID[1] = LoadTabTemplateMenu; // "Columns to Display" hasn't a set id, so use SHCUT_FINISH+1
+ wxMenu* menuarray[ menuno ]; wxMenu* submenuarray[ submenuno ];
+diff --git a/Bookmarks.cpp b/Bookmarks.cpp
+index e0e2e7d..65ae21c 100644
+--- a/Bookmarks.cpp
++++ b/Bookmarks.cpp
+@@ -318,6 +318,8 @@ END_EVENT_TABLE()
+
+ //--------------------------------------------------------------------------------------------------------------------
+
++int Bookmarks::m_menuindex = -1;
++
+ Bookmarks::Bookmarks()
+ {
+ LoadBookmarks();
+@@ -336,8 +338,9 @@ MenuStruct.ClearData(); // Make sure the arrays are em
+ bookmarkID = ID_FIRST_BOOKMARK; // Similarly reset bookmarkID
+ MenuStruct.ID = GetNextID(); // & use it indirectly to id MenuStruct
+
+-wxMenu* menu = MenuBar->GetMenu(MenuBar->FindMenu(_("Bookmarks"))); // Find the menu for the group
+-if (menu==NULL) { wxLogError(_("Couldn't find menu!?")); return; }
++wxCHECK_RET(m_menuindex > wxNOT_FOUND, wxT("Bookmarks menu index not set")); // Should have been set when the bar was loaded
++wxMenu* menu = MenuBar->GetMenu(m_menuindex); // Find the menu for the group
++if (!menu) { wxLogError(_("Couldn't find menu!?")); return; }
+
+ MenuStruct.pathname = wxT("/Bookmarks");
+ MenuStruct.FullLabel.Empty(); // Needed for re-entry during Save/Load
+@@ -435,8 +438,10 @@ config->Flush();
+
+ wxMenuBar* MenuBar = MyFrame::mainframe->GetMenuBar(); // We now have to destroy the menu structure, so it can be born again
+ if (MenuBar==NULL) { wxLogError(_("Couldn't load Menubar!?")); return; }
+-
+-wxMenu* mainmenu = MenuBar->GetMenu(MenuBar->FindMenu(_("Bookmarks"))); // Find the menu for the group
++
++wxCHECK_RET(m_menuindex > wxNOT_FOUND, wxT("Bookmarks menu index not set")); // Should have been set when the bar was loaded
++wxMenu* mainmenu = MenuBar->GetMenu(m_menuindex); // Find the menu for the group
++if (!mainmenu) { wxLogError(_("Couldn't find menu!?")); return; }
+
+ for (size_t count=mainmenu->GetMenuItemCount(); count > 3 ; --count) // Skip the 1st 3 items, they're Add, Manage & a Separator
+ mainmenu->Destroy(mainmenu->GetMenuItems().Item(count-1)->GetData()); // Destroy all the others, including submenus
+diff --git a/Bookmarks.h b/Bookmarks.h
+index b476a4d..a52109c 100644
+--- a/Bookmarks.h
++++ b/Bookmarks.h
+@@ -173,6 +173,8 @@ bool Cut(wxTreeItemId item);
+ bool Paste(wxTreeItemId item, bool NoDupCheck=false, bool duplicating=false);
+ bool Copy(wxTreeItemId item);
+
++static void SetMenuIndex(int index) { m_menuindex = index; }
++
+ wxDialog* adddlg; // These 2 ptrs are used to access their dialogs from other methods
+ MyBookmarkDialog* mydlg;
+ BMClipboard bmclip; // Stores the TreeItemData & structs for pasting
+@@ -182,7 +184,8 @@ wxConfigBase* config;
+ MyBmTree* tree; // The treectrl used in ManageBookmarks
+ bool m_altered; // Do we have anything to save?
+
+-unsigned int bookmarkID; // Actually it ID's folders & separators too
++static int m_menuindex; // Passed to wxMenuBar::GetMenu so we can ID the menu without using its label
++unsigned int bookmarkID; // Actually it ID.s folders & separators too
+ unsigned int GetNextID(){ if (bookmarkID == ID__LAST_BOOKMARK) bookmarkID=ID_FIRST_BOOKMARK; // Recycle
+ return bookmarkID++; } // Return next vacant bookmarkID
+
+diff --git a/Tools.cpp b/Tools.cpp
+index 60b5879..f5ec1fe 100644
+--- a/Tools.cpp
++++ b/Tools.cpp
+@@ -2678,6 +2678,8 @@ BriefLogStatus bls(msg + msgA + msgB);
+ }
+ //-----------------------------------------------------------------------------------------------------------------------
+
++int LaunchMiscTools::m_menuindex = -1;
++
+ void LaunchMiscTools::ClearData()
+ {
+ for (int n = (int)ToolArray.GetCount(); n > 0; --n) { UserDefinedTool* item = ToolArray.Item(n-1); delete item; ToolArray.RemoveAt(n-1); }
+@@ -2691,9 +2693,9 @@ LoadArrays();
+ if (!FolderArray.GetCount()) return; // No data, not event the "Run a Program" menu
+
+ if (tools == NULL) // If so, we're loading the menubar menu, so find it
+- { int id = MyFrame::mainframe->GetMenuBar()->FindMenu(_("Too&ls")); // Find the Tools menu id
+- if (id == wxNOT_FOUND) return;
+- tools = MyFrame::mainframe->GetMenuBar()->GetMenu(id); // Get ptr to the menu itself
++ { wxCHECK_RET(m_menuindex > wxNOT_FOUND, wxT("Tools menu index not set")); // Should have been set when the bar was loaded
++ tools = MyFrame::mainframe->GetMenuBar()->GetMenu(m_menuindex);
++ wxCHECK_RET(tools, wxT("Couldn't find the Tools menu"));
+ static bool alreadyloaded=false; if (!alreadyloaded) { tools->AppendSeparator(); alreadyloaded=true; } // We don't want multiple separators due to reloads
+ }
+
+@@ -2777,9 +2779,9 @@ config->DeleteGroup(wxT("/Tools/Launch")); // Delete current info (oth
+ Save(wxT("/Tools/Launch"), config); // Recursively save
+ config->Flush();
+
+-int id = MyFrame::mainframe->GetMenuBar()->FindMenu(_("Tools")); // Find the id of the Tools menu proper
+-if (id == wxNOT_FOUND) return;
+-wxMenu* tools = MyFrame::mainframe->GetMenuBar()->GetMenu(id); // & hence the menu itself
++wxCHECK_RET(m_menuindex > wxNOT_FOUND, wxT("Tools menu index not set")); // Should have been set when the bar was loaded
++wxMenu* tools = MyFrame::mainframe->GetMenuBar()->GetMenu(m_menuindex);
++wxCHECK_RET(tools, wxT("Couldn't find the Tools menu"));
+
+ int sm = tools->FindItem(FolderArray[0]->Label); // Find the id menu of the relevant submenu in the Tools menu
+ if (sm == wxNOT_FOUND) return;
+diff --git a/Tools.h b/Tools.h
+index d6a7f58..6554a82 100644
+--- a/Tools.h
++++ b/Tools.h
+@@ -494,6 +494,8 @@ ArrayOfUserDefinedTools* GetToolarray(){ return &ToolArray; }
+ ArrayOfToolFolders* GetFolderArray(){ return &FolderArray; }
+ size_t GetLastCommand(){ return LastCommandNo; }
+
++static void SetMenuIndex(int index) { m_menuindex = index; }
++
+ protected:
+ void Load(wxString name); // Load (sub)menu 'name' from config
+ void ClearData();
+@@ -505,6 +507,7 @@ bool SetCorrectPaneptrs(const wxChar* &pc, MyGenericDirCtrl* &first, MyGenericDi
+ ArrayOfUserDefinedTools ToolArray;
+ ArrayOfToolFolders FolderArray;
+ int EventId; // Holds the first spare ID, from SHCUT_TOOLS_LAUNCH to SHCUT_TOOLS_LAUNCH_LAST-1
++static int m_menuindex; // Passed to wxMenuBar::GetMenu so we can ID the menu without using its label
+ size_t EntriesIndex;
+ size_t FolderIndex;
+ size_t LastCommandNo; // Holds the last tool used, so it can be repeated
+--
+2.1.0
+
diff --git a/4Pane.spec b/4Pane.spec
new file mode 100644
index 0000000..9c71f74
--- /dev/null
+++ b/4Pane.spec
@@ -0,0 +1,104 @@
+# Multiple files refers to the name "4Pane", not "4pane", so
+# let's use 4Pane as %%{name}
+
+# Explicitly declare this, as this package
+# really expects this
+# (expanded afterwards, use %%define)
+%define _docdir_fmt %{NAME}
+
+Name: 4Pane
+Version: 3.0
+Release: 3%{?dist}
+Summary: Multi-pane, detailed-list file manager
+
+License: GPLv3
+URL: http://www.4pane.co.uk/
+Source0: http://downloads.sourceforge.net/fourpane/4pane-%{version}.tar.gz
+# https://sourceforge.net/p/fourpane/discussion/767206/thread/9daf0cda/
+Patch0: 4Pane-HEAD-0001-When-getting-a-pointer-to-a-menubar-menu-don-t-searc.patch
+
+BuildRequires: bzip2-devel
+BuildRequires: xz-devel
+BuildRequires: wxGTK3-devel
+BuildRequires: desktop-file-utils
+
+%description
+4Pane is a multi-pane, detailed-list file manager. It is designed
+to be fully-featured without bloat, and aims for speed rather than
+visual effects.
+In addition to standard file manager things, it offers multiple
+undo and redo of most operations (including deletions), archive
+management including 'virtual browsing' inside archives, multiple
+renaming/duplication of files, a terminal emulator and user-defined
+tools.
+
+%prep
+%setup -q -n 4pane-%{version}
+%patch0 -p1
+
+sed -i -e '\@Icon=@s|^.*$|Icon=%{name}|' rc/%{name}.desktop
+
+%build
+export WX_CONFIG_NAME=wx-config-3.0
+export EXTRA_CXXFLAGS="%{optflags}"
+
+# --without-builtin_bzip2 means using system bzip2
+%configure\
+ --disable-desktop \
+ --without-builtin_bzip2
+make %{?_smp_mflags}
+
+%install
+%make_install \
+ INSTALL="install -p"
+
+# Some manual installation
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{48x48,32x32}/apps
+
+install -cpm 644 rc/%{name}.desktop %{buildroot}%{_datadir}/applications/
+install -cpm 644 bitmaps/%{name}Icon32.xpm %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+install -cpm 644 bitmaps/%{name}Icon48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%find_lang %{name}
+
+# Once remove document and let %%doc re-install them
+rm -rf %{buildroot}%{_docdir}/%{name}
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files -f %{name}.lang
+%license LICENCE
+%doc doc/*
+%doc README
+%doc changelog
+
+%{_bindir}/4pane
+%{_bindir}/%{name}
+
+%{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}*
+
+%changelog
+* Thu Dec 11 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.0-3
+- Replace Patch0 with the one revised by the upstream
+
+* Wed Dec 10 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.0-2
+- Patch to fix crash with managing bookmark on non-English
+ locale (sourceforge 767206)
+
+* Tue Dec 9 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.0-1
+- Initial package
diff --git a/sources b/sources
index e69de29..2ba50da 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+396f968e3cd77c0d8f56c3d687b9ee32 4pane-3.0.tar.gz
More information about the scm-commits
mailing list