summarylogtreecommitdiffstats
path: root/01_path_changes.diff
diff options
context:
space:
mode:
authorStephen Berquet2016-12-22 05:21:49 +0100
committerStephen Berquet2016-12-22 05:21:49 +0100
commitc652835571e9e3fdf46c2f89a088814ce9740a7a (patch)
tree358312eddc38bfd5e019ede265004cdaaadd3c51 /01_path_changes.diff
downloadaur-kiki-re.tar.gz
init
Diffstat (limited to '01_path_changes.diff')
-rw-r--r--01_path_changes.diff57
1 files changed, 57 insertions, 0 deletions
diff --git a/01_path_changes.diff b/01_path_changes.diff
new file mode 100644
index 000000000000..dfae6ce7eace
--- /dev/null
+++ b/01_path_changes.diff
@@ -0,0 +1,57 @@
+Description: Corrects path values.
+Author: Matthias Klose <doko@debian.org>
+--- a/kiki.py
++++ b/kiki.py
+@@ -22,6 +22,9 @@
+ icq: 84243714
+ """
+
++import wxversion
++wxversion.select('2.8')
++
+ import wx
+ import wx.html
+
+@@ -365,6 +368,7 @@
+ self.matches = [] # list of found matches
+
+ self.path = os.path.split(sys.argv[0])[0] or os.getcwd() # remembers where Kiki is located
++ self.doc_path = "/usr/share/doc/kiki"
+
+ def icon(self, path=None):
+ """Load and assign the icon
+@@ -379,14 +383,14 @@
+ self.path = os.path.split(sys.argv[0])[0] or os.getcwd() # *MUST* be the directory where everything, including About data and the likes are located
+ else:
+ self.path = path
+- iconfile = os.path.join(self.path, "kiki.ico")
+- theicon = wx.Icon(iconfile, wx.BITMAP_TYPE_ICO)
++ iconfile = "/usr/share/pixmaps/kiki.xpm"
++ theicon = wx.Icon(iconfile, wx.BITMAP_TYPE_XPM)
+ self.SetIcon(theicon)
+
+ def changePage(self, event):
+ """Handles notebook page changes"""
+ if event.GetSelection()==2 and not self.HelpWindow.GetOpenedPageTitle().strip():
+- self.HelpWindow.SetPage(file(os.path.join(self.path, "docs", "index.html"),"r").read())
++ self.HelpWindow.SetPage(file(os.path.join(self.doc_path, "index.html"),"r").read())
+
+ def showhelp(self, event):
+ """Handles help combo box events"""
+@@ -409,14 +413,14 @@
+ else:
+ simpleload = False
+ if simpleload:
+- filename = os.path.join(self.path, "docs", filename)
++ filename = os.path.join(self.doc_path, filename)
+ if anchor.strip():
+ anchor = "#" + anchor
+ else:
+ anchor = ""
+ self.HelpWindow.LoadPage(filename+anchor)
+ else: # build about-screen
+- f = file(os.path.join(self.path, "docs", "about.html"), "r")
++ f = file(os.path.join(self.doc_path, "about.html"), "r")
+ about = f.read()
+ f.close()
+ # build the dictionary needed to format the string