Merge lp:~hyuchia/pantheon-calculator/fix-1594598 into lp:~elementary-apps/pantheon-calculator/trunk

[Diego Islas Ocampo]

Removed all instances of org.pantheon and replaced them with the io.elementary Scheme

[lp:~hyuchia/pantheon-calculator/fix-1594598]

322. By Diego Islas Ocampo on 2017-03-02

Merge with latest trunk

323. By Diego Islas Ocampo on 2017-03-02

Use the right scheme for paths

Unmerged revisions

323. By Diego Islas Ocampo on 2017-03-02

Use the right scheme for paths

322. By Diego Islas Ocampo on 2017-03-02

Merge with latest trunk

321. By Diego Islas Ocampo on 2017-02-25

Use the right reversed elementary Scheme

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-01-19 21:17:21 +0000
+++ CMakeLists.txt	2017-03-02 01:54:13 +0000
@@ -57,7 +57,7 @@
 )
 
 include(GSettings)
-add_schema("data/org.pantheon.calculator.gschema.xml")
+add_schema("data/io.elementary.calculator.gschema.xml")
 
 add_subdirectory (po)
 

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2016-09-01 06:57:26 +0000
+++ data/CMakeLists.txt	2017-03-02 01:54:13 +0000
@@ -1,5 +1,5 @@
-configure_file (org.pantheon.calculator.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop.in)
-configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop ${CMAKE_SOURCE_DIR}/po/)
-configure_file_translation (${CMAKE_CURRENT_SOURCE_DIR}/org.pantheon.calculator.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.desktop DESTINATION share/applications)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.pantheon.calculator.appdata.xml DESTINATION share/appdata)
+configure_file (io.elementary.calculator.desktop.in.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.calculator.desktop.in)
+configure_file_translation (${CMAKE_CURRENT_BINARY_DIR}/io.elementary.calculator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.calculator.desktop ${CMAKE_SOURCE_DIR}/po/)
+configure_file_translation (${CMAKE_CURRENT_SOURCE_DIR}/io.elementary.calculator.appdata.xml.in ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.calculator.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.calculator.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/io.elementary.calculator.appdata.xml DESTINATION share/appdata)

=== added file 'data/io.elementary.calculator.appdata.xml.in'
--- data/io.elementary.calculator.appdata.xml.in	1970-01-01 00:00:00 +0000
+++ data/io.elementary.calculator.appdata.xml.in	2017-03-02 01:54:13 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015-2016 elementary, LLC <[e-mail]> -->
+<component type="desktop">
+    <id>io.elementary.calculator.desktop</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_group>elementary</project_group>
+    <project_license>GPL-3.0+</project_license>
+    <_name>Calculator</_name>
+    <description>
+        <_p>
+            A simple calculator for everyday use. It supports basic and some
+            scientific calculations including trigonometry functions, sin, cos, and tan.
+        </_p>
+    </description>
+    <provides>
+        <binary>pantheon-calculator</binary>
+    </provides>
+    <developer_name>elementary LLC.</developer_name>
+    <url type="homepage">https://elementary.io/</url>
+    <url type="bugtracker">https://bugs.launchpad.net/pantheon-calculator</url>
+    <url type="donation">https://elementary.io/get-involved#funding</url>
+    <url type="help">https://elementaryos.stackexchange.com/questions/tagged/calculator</url>
+    <update_contact>contact_at_elementary.io</update_contact>
+</component>

=== added file 'data/io.elementary.calculator.desktop.in.in'
--- data/io.elementary.calculator.desktop.in.in	1970-01-01 00:00:00 +0000
+++ data/io.elementary.calculator.desktop.in.in	2017-03-02 01:54:13 +0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=Calculator
+_Comment=Solve simple equations
+Exec=pantheon-calculator %U
+Icon=accessories-calculator
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Utility;Calculator;
+Actions=AboutDialog;
+
+[Desktop Action AboutDialog]
+_Name=About Calculator
+Exec=pantheon-calculator --about

=== added file 'data/io.elementary.calculator.gschema.xml'
--- data/io.elementary.calculator.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/io.elementary.calculator.gschema.xml	2017-03-02 01:54:13 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+    <schema path="/io/elementary/calculator/saved-state/" id="io.elementary.calculator.saved-state" gettext-domain="pantheon-calculator">
+        <key name="extended-shown" type="b">
+            <default>false</default>
+            <summary>Saves the state of the extended panel (open or closed).</summary>
+            <description>Saves the state of the extended panel (open or closed).</description>
+        </key>
+        <key name="entry-content" type="s">
+            <default>""</default>
+            <summary>Saves the content of the entry field for calculations.</summary>
+            <description>Saves the content of the entry field for calculations.</description>
+        </key>
+        <key name="decimal-places" type="i">
+            <default>5</default>
+            <summary>Saves the decimal places for displayed values.</summary>
+            <description>Saves the decimal places for displayed values.</description>
+        </key>
+        <key name="window-x" type="i">
+            <default>-100</default>
+            <summary>Window x position.</summary>
+            <description>Saved x position of main calculator window.</description>
+        </key>
+        <key name="window-y" type="i">
+            <default>-100</default>
+            <summary>Window y position.</summary>
+            <description>Saved y position of main calculator window.</description>
+        </key>
+    </schema>
+</schemalist>

=== removed file 'data/org.pantheon.calculator.appdata.xml.in'
--- data/org.pantheon.calculator.appdata.xml.in	2016-09-01 06:57:26 +0000
+++ data/org.pantheon.calculator.appdata.xml.in	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015-2016 elementary, LLC <[e-mail]> -->
-<component type="desktop">
-    <id>org.pantheon.calculator.desktop</id>
-    <metadata_license>CC0-1.0</metadata_license>
-    <project_group>elementary</project_group>
-    <project_license>GPL-3.0+</project_license>
-    <_name>Calculator</_name>
-    <description>
-        <_p>
-            A simple calculator for everyday use. It supports basic and some
-            scientific calculations including trigonometry functions, sin, cos, and tan.
-        </_p>
-    </description>
-    <provides>
-        <binary>pantheon-calculator</binary>
-    </provides>
-    <developer_name>elementary LLC.</developer_name>
-    <url type="homepage">https://elementary.io/</url>
-    <url type="bugtracker">https://bugs.launchpad.net/pantheon-calculator</url>
-    <url type="donation">https://elementary.io/get-involved#funding</url>
-    <url type="help">https://elementaryos.stackexchange.com/questions/tagged/calculator</url>
-    <update_contact>contact_at_elementary.io</update_contact>
-</component>

=== removed file 'data/org.pantheon.calculator.desktop.in.in'
--- data/org.pantheon.calculator.desktop.in.in	2016-09-01 06:57:26 +0000
+++ data/org.pantheon.calculator.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-_Name=Calculator
-_Comment=Solve simple equations
-Exec=pantheon-calculator %U
-Icon=accessories-calculator
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Utility;Calculator;
-Actions=AboutDialog;
-
-[Desktop Action AboutDialog]
-_Name=About Calculator
-Exec=pantheon-calculator --about

=== removed file 'data/org.pantheon.calculator.gschema.xml'
--- data/org.pantheon.calculator.gschema.xml	2016-11-26 20:51:29 +0000
+++ data/org.pantheon.calculator.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-    <schema path="/org/pantheon/calculator/saved-state/" id="org.pantheon.calculator.saved-state" gettext-domain="pantheon-calculator">
-        <key name="extended-shown" type="b">
-            <default>false</default>
-            <summary>Saves the state of the extended panel (open or closed).</summary>
-            <description>Saves the state of the extended panel (open or closed).</description>
-        </key>
-        <key name="entry-content" type="s">
-            <default>""</default>
-            <summary>Saves the content of the entry field for calculations.</summary>
-            <description>Saves the content of the entry field for calculations.</description>
-        </key>
-        <key name="decimal-places" type="i">
-            <default>5</default>
-            <summary>Saves the decimal places for displayed values.</summary>
-            <description>Saves the decimal places for displayed values.</description>
-        </key>
-        <key name="window-x" type="i">
-            <default>-100</default>
-            <summary>Window x position.</summary>
-            <description>Saved x position of main calculator window.</description>
-        </key>
-        <key name="window-y" type="i">
-            <default>-100</default>
-            <summary>Window y position.</summary>
-            <description>Saved y position of main calculator window.</description>
-        </key>
-    </schema>
-</schemalist>

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2016-12-22 18:57:07 +0000
+++ src/MainWindow.vala	2017-03-02 01:54:13 +0000
@@ -53,7 +53,7 @@
             set_resizable (false);
             window_position = Gtk.WindowPosition.CENTER;
 
-            settings = new Settings ("org.pantheon.calculator.saved-state");
+            settings = new Settings ("io.elementary.calculator.saved-state");
             decimal_places = settings.get_int ("decimal-places");
 
             history = new List<History?> ();

=== modified file 'src/PantheonCalculator.vala'
--- src/PantheonCalculator.vala	2016-11-26 22:55:50 +0000
+++ src/PantheonCalculator.vala	2017-03-02 01:54:13 +0000
@@ -21,7 +21,7 @@
 
     public class PantheonCalculatorApp : Granite.Application {
         construct {
-            application_id = "org.pantheon.calculator";
+            application_id = "io.elementary.calculator";
             flags = ApplicationFlags.FLAGS_NONE;
 
             Intl.setlocale (LocaleCategory.ALL, "");
@@ -36,7 +36,7 @@
             build_version = Build.VERSION;
             build_version_info = Build.VERSION_INFO;
 
-            app_launcher = "org.pantheon.calculator.desktop";
+            app_launcher = "io.elementary.calculator.desktop";
             main_url = "https://launchpad.net/pantheon-calculator";
             bug_url = "https://bugs.launchpad.net/pantheon-calculator";
             help_url = "https://answers.launchpad.net/pantheon-calculator";