[gnome-maps] Rename placeBubble -> placeView
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps] Rename placeBubble -> placeView
- Date: Tue, 9 Feb 2021 20:56:56 +0000 (UTC)
commit 39cf3f63dd9a84e80a2be3867dd4aab8232151ef
Author: James Westman <james flyingpimonster net>
Date: Mon Dec 28 16:01:49 2020 -0600
Rename placeBubble -> placeView
It's no longer a subclass of MapBubble, so PlaceView is a more fitting name.
Also rename PlaceBubbleImage -> PlaceViewImage.
data/org.gnome.Maps.data.gresource.xml | 2 +-
data/ui/{map-bubble.ui => place-view.ui} | 2 +-
po/POTFILES.in | 2 +-
src/mapBubble.js | 4 ++--
src/org.gnome.Maps.src.gresource.xml | 4 ++--
src/placeMarker.js | 1 -
src/{placeBubble.js => placeView.js} | 8 ++++----
src/{placeBubbleImage.js => placeViewImage.js} | 4 ++--
8 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/data/org.gnome.Maps.data.gresource.xml b/data/org.gnome.Maps.data.gresource.xml
index c579f009..87062c86 100644
--- a/data/org.gnome.Maps.data.gresource.xml
+++ b/data/org.gnome.Maps.data.gresource.xml
@@ -14,7 +14,6 @@
<file preprocess="xml-stripblanks">ui/shape-layer-file-chooser.ui</file>
<file preprocess="xml-stripblanks">ui/location-service-dialog.ui</file>
<file preprocess="xml-stripblanks">ui/main-window.ui</file>
- <file preprocess="xml-stripblanks">ui/map-bubble.ui</file>
<file preprocess="xml-stripblanks">ui/open-with-row.ui</file>
<file preprocess="xml-stripblanks">ui/osm-account-dialog.ui</file>
<file preprocess="xml-stripblanks">ui/osm-edit-address.ui</file>
@@ -27,6 +26,7 @@
<file preprocess="xml-stripblanks">ui/place-entry.ui</file>
<file preprocess="xml-stripblanks">ui/place-list-row.ui</file>
<file preprocess="xml-stripblanks">ui/place-popover.ui</file>
+ <file preprocess="xml-stripblanks">ui/place-view.ui</file>
<file preprocess="xml-stripblanks">ui/route-entry.ui</file>
<file preprocess="xml-stripblanks">ui/send-to-dialog.ui</file>
<file preprocess="xml-stripblanks">ui/sidebar.ui</file>
diff --git a/data/ui/map-bubble.ui b/data/ui/place-view.ui
similarity index 98%
rename from data/ui/map-bubble.ui
rename to data/ui/place-view.ui
index efbc889f..4c9a05b0 100644
--- a/data/ui/map-bubble.ui
+++ b/data/ui/place-view.ui
@@ -10,7 +10,7 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="Gjs_PlaceBubbleImage" id="bubble-thumbnail">
+ <object class="Gjs_PlaceViewImage" id="bubble-thumbnail">
<property name="visible">False</property>
<property name="can_focus">False</property>
</object>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index db80a06e..6eef43eb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -43,8 +43,8 @@ src/mapView.js
src/osmConnection.js
src/osmEditDialog.js
src/photonParser.js
-src/placeBubble.js
src/placeEntry.js
+src/placeView.js
src/place.js
src/printLayout.js
src/printOperation.js
diff --git a/src/mapBubble.js b/src/mapBubble.js
index 3663539d..b7217fad 100644
--- a/src/mapBubble.js
+++ b/src/mapBubble.js
@@ -29,7 +29,7 @@ const Application = imports.application;
const ContactPlace = imports.contactPlace;
const GeocodeFactory = imports.geocode;
const Place = imports.place;
-const PlaceBubble = imports.placeBubble;
+const PlaceView = imports.placeView;
const PlaceButtons = imports.placeButtons;
const PlaceFormatter = imports.placeFormatter;
const PlaceStore = imports.placeStore;
@@ -57,7 +57,7 @@ class MapBubble extends Gtk.Popover {
super._init(params);
- let content = new PlaceBubble.PlaceBubble({ place, mapView, visible: true });
+ let content = new PlaceView.PlaceView({ place, mapView, visible: true });
let scrolledWindow = new MapBubbleScrolledWindow({ visible: true,
propagateNaturalWidth: true,
diff --git a/src/org.gnome.Maps.src.gresource.xml b/src/org.gnome.Maps.src.gresource.xml
index 83927581..dd9da686 100644
--- a/src/org.gnome.Maps.src.gresource.xml
+++ b/src/org.gnome.Maps.src.gresource.xml
@@ -56,8 +56,6 @@
<file>photonParser.js</file>
<file>place.js</file>
<file>placeBar.js</file>
- <file>placeBubble.js</file>
- <file>placeBubbleImage.js</file>
<file>placeButtons.js</file>
<file>placeEntry.js</file>
<file>placeFormatter.js</file>
@@ -65,6 +63,8 @@
<file>placeMarker.js</file>
<file>placePopover.js</file>
<file>placeStore.js</file>
+ <file>placeView.js</file>
+ <file>placeViewImage.js</file>
<file>printLayout.js</file>
<file>printOperation.js</file>
<file>route.js</file>
diff --git a/src/placeMarker.js b/src/placeMarker.js
index a7c8c201..3aba8c8b 100644
--- a/src/placeMarker.js
+++ b/src/placeMarker.js
@@ -22,7 +22,6 @@
const GObject = imports.gi.GObject;
const MapMarker = imports.mapMarker;
-const PlaceBubble = imports.placeBubble;
var PlaceMarker = GObject.registerClass(
class PlaceMarker extends MapMarker.MapMarker {
diff --git a/src/placeBubble.js b/src/placeView.js
similarity index 99%
rename from src/placeBubble.js
rename to src/placeView.js
index 3814f655..628dee03 100644
--- a/src/placeBubble.js
+++ b/src/placeView.js
@@ -31,7 +31,7 @@ const Application = imports.application;
const ContactPlace = imports.contactPlace;
const Overpass = imports.overpass;
const Place = imports.place;
-const PlaceBubbleImage = imports.placeBubbleImage;
+const PlaceViewImage = imports.placeViewImage;
const PlaceButtons = imports.placeButtons;
const PlaceFormatter = imports.placeFormatter;
const PlaceStore = imports.placeStore;
@@ -42,7 +42,7 @@ const Wikipedia = imports.wikipedia;
// maximum dimension of thumbnails to fetch from Wikipedia
const THUMBNAIL_FETCH_SIZE = 360;
-var PlaceBubble = GObject.registerClass({
+var PlaceView = GObject.registerClass({
Properties: {
'overpass-place': GObject.ParamSpec.object('overpass-place',
'Overpass Place',
@@ -51,7 +51,7 @@ var PlaceBubble = GObject.registerClass({
GObject.ParamFlags.WRITABLE,
Geocode.Place)
}
-}, class PlaceBubble extends Gtk.Box {
+}, class PlaceView extends Gtk.Box {
_init(params) {
this._place = params.place;
@@ -62,7 +62,7 @@ var PlaceBubble = GObject.registerClass({
super._init(params);
- let ui = Utils.getUIObject('map-bubble', [ 'bubble-main-box',
+ let ui = Utils.getUIObject('place-view', [ 'bubble-main-box',
'bubble-spinner',
'bubble-thumbnail',
'thumbnail-separator',
diff --git a/src/placeBubbleImage.js b/src/placeViewImage.js
similarity index 96%
rename from src/placeBubbleImage.js
rename to src/placeViewImage.js
index 8c9449b2..56d0c2cb 100644
--- a/src/placeBubbleImage.js
+++ b/src/placeViewImage.js
@@ -27,8 +27,8 @@ const Gtk = imports.gi.Gtk;
/* The maximum aspect ratio, after which the image will be cropped vertically */
const MAX_ASPECT_RATIO = 1;
-var PlaceBubbleImage = GObject.registerClass(
-class PlaceBubbleImage extends Gtk.DrawingArea {
+var PlaceViewImage = GObject.registerClass(
+class PlaceViewImage extends Gtk.DrawingArea {
_init(params) {
super._init(params);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]