[gnome-maps] Change shareDialog to sendToDialog
- From: Jonas Danielsson <jonasdn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps] Change shareDialog to sendToDialog
- Date: Sun, 1 Feb 2015 00:09:31 +0000 (UTC)
commit 021496c1c284f4a5da938fdbd127f026f3482484
Author: Jonas Danielsson <jonas threetimestwo org>
Date: Tue Jan 13 05:38:02 2015 -0500
Change shareDialog to sendToDialog
https://bugzilla.gnome.org/show_bug.cgi?id=741757
data/org.gnome.Maps.data.gresource.xml | 2 +-
data/ui/map-bubble.ui | 8 ++++----
data/ui/{share-dialog.ui => send-to-dialog.ui} | 6 +++---
po/POTFILES.in | 2 +-
src/mapBubble.js | 18 +++++++++---------
src/org.gnome.Maps.src.gresource.xml | 2 +-
src/placeBubble.js | 2 +-
src/{shareDialog.js => sendToDialog.js} | 18 +++++++++---------
src/userLocationBubble.js | 2 +-
9 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/data/org.gnome.Maps.data.gresource.xml b/data/org.gnome.Maps.data.gresource.xml
index 72bc1e9..d775af4 100644
--- a/data/org.gnome.Maps.data.gresource.xml
+++ b/data/org.gnome.Maps.data.gresource.xml
@@ -17,7 +17,7 @@
<file preprocess="xml-stripblanks">ui/place-list-row.ui</file>
<file preprocess="xml-stripblanks">ui/route-entry.ui</file>
<file preprocess="xml-stripblanks">ui/search-popup.ui</file>
- <file preprocess="xml-stripblanks">ui/share-dialog.ui</file>
+ <file preprocess="xml-stripblanks">ui/send-to-dialog.ui</file>
<file preprocess="xml-stripblanks">ui/sidebar.ui</file>
<file preprocess="xml-stripblanks">ui/social-place-more-results-row.ui</file>
<file preprocess="xml-stripblanks">ui/social-place-row.ui</file>
diff --git a/data/ui/map-bubble.ui b/data/ui/map-bubble.ui
index a6a7051..b83cbdf 100644
--- a/data/ui/map-bubble.ui
+++ b/data/ui/map-bubble.ui
@@ -63,16 +63,16 @@
</object>
</child>
<child>
- <object class="GtkButton" id="bubble-share-button">
- <property name="name">bubble-share-button</property>
+ <object class="GtkButton" id="bubble-send-to-button">
+ <property name="name">bubble-send-to-button</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<child>
- <object class="GtkImage" id="bubble-share-button-image">
+ <object class="GtkImage" id="bubble-send-to-button-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon-name">folder-publicshare-symbolic</property>
+ <property name="icon-name">send-to-symbolic</property>
<property name="pixel_size">16</property>
</object>
</child>
diff --git a/data/ui/share-dialog.ui b/data/ui/send-to-dialog.ui
similarity index 96%
rename from data/ui/share-dialog.ui
rename to data/ui/send-to-dialog.ui
index 98f84bb..798b6e8 100644
--- a/data/ui/share-dialog.ui
+++ b/data/ui/send-to-dialog.ui
@@ -2,7 +2,7 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
- <template class="Gjs_ShareDialog" parent="GtkDialog">
+ <template class="Gjs_SendToDialog" parent="GtkDialog">
<property name="visible">False</property>
<property name="can_focus">False</property>
<property name="use_header_bar">1</property>
@@ -11,7 +11,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">False</property>
- <property name="title" translatable="yes">Share location</property>
+ <property name="title" translatable="yes">Open location</property>
<style>
<class name="titlebar"/>
</style>
@@ -31,7 +31,7 @@
</child>
<child>
<object class="GtkButton" id="chooseButton">
- <property name="label" translatable="yes">_Share</property>
+ <property name="label" translatable="yes">_Open</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 17b1f18..fffb989 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,7 @@ data/org.gnome.Maps.gschema.xml.in
[type: gettext/glade]data/ui/main-window.ui
[type: gettext/glade]data/ui/map-bubble.ui
[type: gettext/glade]data/ui/search-popup.ui
-[type: gettext/glade]data/ui/share-dialog.ui
+[type: gettext/glade]data/ui/send-to-dialog.ui
[type: gettext/glade]data/ui/sidebar.ui
[type: gettext/glade]data/ui/social-place-more-results-row.ui
[type: gettext/glade]data/ui/user-location-bubble.ui
diff --git a/src/mapBubble.js b/src/mapBubble.js
index b39a148..a32693e 100644
--- a/src/mapBubble.js
+++ b/src/mapBubble.js
@@ -30,13 +30,13 @@ const Mainloop = imports.mainloop;
const Application = imports.application;
const Place = imports.place;
const PlaceStore = imports.placeStore;
-const ShareDialog = imports.shareDialog;
+const SendToDialog = imports.sendToDialog;
const Utils = imports.utils;
const Button = {
NONE: 0,
ROUTE: 2,
- SHARE: 4,
+ SEND_TO: 4,
FAVORITE: 8,
CHECK_IN: 16
};
@@ -73,7 +73,7 @@ const MapBubble = new Lang.Class({
'bubble-content-area',
'bubble-button-area',
'bubble-route-button',
- 'bubble-share-button',
+ 'bubble-send-to-button',
'bubble-favorite-button',
'bubble-check-in-button']);
this._image = ui.bubbleImage;
@@ -84,8 +84,8 @@ const MapBubble = new Lang.Class({
else {
if (buttonFlags & Button.ROUTE)
this._initRouteButton(ui.bubbleRouteButton, routeFrom);
- if (buttonFlags & Button.SHARE)
- this._initShareButton(ui.bubbleShareButton);
+ if (buttonFlags & Button.SEND_TO)
+ this._initSendToButton(ui.bubbleSendToButton);
if (buttonFlags & Button.FAVORITE)
this._initFavoriteButton(ui.bubbleFavoriteButton);
if (buttonFlags & Button.CHECK_IN)
@@ -123,10 +123,10 @@ const MapBubble = new Lang.Class({
}).bind(this));
},
- _initShareButton: function(button) {
- let dialog = new ShareDialog.ShareDialog({ transient_for: this.get_toplevel(),
- place: this._place });
- if (!dialog.ensureShares())
+ _initSendToButton: function(button) {
+ let dialog = new SendToDialog.SendToDialog({ transient_for: this.get_toplevel(),
+ place: this._place });
+ if (!dialog.ensureApplications())
return;
button.visible = true;
diff --git a/src/org.gnome.Maps.src.gresource.xml b/src/org.gnome.Maps.src.gresource.xml
index ac110ba..1e6cdb9 100644
--- a/src/org.gnome.Maps.src.gresource.xml
+++ b/src/org.gnome.Maps.src.gresource.xml
@@ -41,7 +41,7 @@
<file>searchPopup.js</file>
<file>serviceBackend.js</file>
<file>settings.js</file>
- <file>shareDialog.js</file>
+ <file>sendToDialog.js</file>
<file>sidebar.js</file>
<file>socialPlace.js</file>
<file>socialPlaceListBox.js</file>
diff --git a/src/placeBubble.js b/src/placeBubble.js
index 66ab8ca..9edea60 100644
--- a/src/placeBubble.js
+++ b/src/placeBubble.js
@@ -42,7 +42,7 @@ const PlaceBubble = new Lang.Class({
'box-content',
'label-title']);
params.buttons = (MapBubble.Button.ROUTE |
- MapBubble.Button.SHARE);
+ MapBubble.Button.SEND_TO);
// We do not serialize contacts to file, so adding them
// as favourites does not makes sense right now.
diff --git a/src/shareDialog.js b/src/sendToDialog.js
similarity index 91%
rename from src/shareDialog.js
rename to src/sendToDialog.js
index 747ee85..0ebe5da 100644
--- a/src/shareDialog.js
+++ b/src/sendToDialog.js
@@ -37,10 +37,10 @@ const Response = {
const _NUM_VISIBLE = 6;
-const ShareDialog = new Lang.Class({
- Name: 'ShareDialog',
+const SendToDialog = new Lang.Class({
+ Name: 'SendToDialog',
Extends: Gtk.Dialog,
- Template: 'resource:///org/gnome/Maps/ui/share-dialog.ui',
+ Template: 'resource:///org/gnome/Maps/ui/send-to-dialog.ui',
InternalChildren: [ 'list',
'weatherRow',
'weatherLabel',
@@ -77,23 +77,23 @@ const ShareDialog = new Lang.Class({
});
},
- ensureShares: function() {
+ ensureApplications: function() {
let weatherInfo = Gio.DesktopAppInfo.new(_WEATHER_APPID + '.desktop');
let clocksInfo = Gio.DesktopAppInfo.new(_CLOCKS_APPID + '.desktop');
- let shareWeather = this._checkWeather(weatherInfo);
- let shareClocks = this._checkClocks(clocksInfo);
+ let appWeather = this._checkWeather(weatherInfo);
+ let appClocks = this._checkClocks(clocksInfo);
- if (!shareWeather)
+ if (!appWeather)
this._weatherRow.hide();
else
this._weatherLabel.label = weatherInfo.get_name();
- if (!shareClocks)
+ if (!appClocks)
this._clocksRow.hide();
else
this._clocksLabel.label = clocksInfo.get_name();
- return shareWeather || shareClocks;
+ return appWeather || appClocks;
},
_onChooseButtonClicked: function() {
diff --git a/src/userLocationBubble.js b/src/userLocationBubble.js
index 2b0fd17..ddcdd64 100644
--- a/src/userLocationBubble.js
+++ b/src/userLocationBubble.js
@@ -34,7 +34,7 @@ const UserLocationBubble = new Lang.Class({
'label-accuracy',
'label-coordinates' ]);
params.buttons = MapBubble.Button.ROUTE |
- MapBubble.Button.SHARE |
+ MapBubble.Button.SEND_TO |
MapBubble.Button.CHECK_IN;
params.routeFrom = true;
params.checkInMatchPlace = false;
[Date Prev][
Date Next] [Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]