Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Moved data/media folder to the root path of the project

  • Loading branch information...
commit b8050cefbfd3f3dba13901600ac4219c9835adf5 1 parent da1ab3b
@zedtux zedtux authored
View
0  data/media/Screenshot.png → media/Screenshot.png
File renamed without changes
View
0  data/media/natural-scrolling-status-activated.png → media/natural-scrolling-status-activated.png
File renamed without changes
View
0  .../media/natural-scrolling-status-not-activated.png → media/natural-scrolling-status-not-activated.png
File renamed without changes
View
0  data/media/naturalscrolling.svg → media/naturalscrolling.svg
File renamed without changes
View
13 naturalscrolling.desktop.in
@@ -1,8 +1,11 @@
[Desktop Entry]
-_Name=Natural Scrolling
-_Comment=Natural Scrolling application
-Categories=GNOME;Utility;
+Type=Application
+Version=1.0
+Name=Natural Scrolling
+GenericName=Natural Scrolling
+Comment=Natural Scrolling application
Exec=naturalscrolling
-Icon=/usr/share/naturalscrolling/media/naturalscrolling.svg
+Icon=media/naturalscrolling.svg
Terminal=false
-Type=Application
+Categories=GTK;Utility;
+StartupNotify=true
View
3  naturalscrolling/indicatormenu.py
@@ -137,8 +137,7 @@ def on_start_at_login_clicked(self, widget, data=None):
auto_start_file_exists = os.path.isfile(get_auto_start_file_path())
if widget.get_active():
if not auto_start_file_exists:
- source = open(get_data_path() + "/" + \
- get_auto_start_file_name(), "r")
+ source = open(get_auto_start_from_data_file_path(), "r")
destination = open(get_auto_start_file_path(), "w")
destination.write(source.read())
destination.close() and source.close()
View
17 naturalscrolling_lib/naturalscrollingconfig.py
@@ -30,11 +30,12 @@
"get_data_path",
"get_auto_start_path",
"get_auto_start_file_name",
- "get_auto_start_file_path"]
+ "get_auto_start_file_path",
+ "get_auto_start_from_data_file_path"]
# Where your project will look for your data (for instance, images and ui
-# files). By default, this is ../data, relative your trunk layout
-__naturalscrolling_data_directory__ = "../data/"
+# files). By default, this is ../, relative your trunk layout
+__naturalscrolling_data_directory__ = "../"
__version__ = "VERSION"
__website__ = "http://webiste"
@@ -64,7 +65,7 @@ def get_data_file(*path_segments):
def get_data_path():
"""Retrieve naturalscrolling data path
- This path is by default <naturalscrolling_lib_path>/../data/ in trunk
+ This path is by default <naturalscrolling_lib_path>/../ in trunk
and /usr/share/naturalscrolling in an installed version but this path
is specified at installation time.
"""
@@ -90,6 +91,14 @@ def get_auto_start_file_name():
return "naturalscrolling.desktop"
+def get_auto_start_from_data_file_path():
+ """
+ Return the full path of the autostart file for naturalscrolling
+ from naturalscrolling data folder
+ """
+ return get_data_path() + "/" + get_auto_start_file_name()
+
+
def get_auto_start_file_path():
""" Return the full path of the autostart file for naturalscrolling """
return get_auto_start_path() + "/" + get_auto_start_file_name()
View
1  setup.py
@@ -56,7 +56,6 @@ def update_config(values={}):
def update_desktop_file(datadir):
-
try:
fin = file("naturalscrolling.desktop.in", "r")
fout = file(fin.name + ".new", "w")
Please sign in to comment.
Something went wrong with that request. Please try again.