[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 15098dd 4/7: Rename icons paste-case*.png -->
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 15098dd 4/7: Rename icons paste-case*.png --> paste-in*.png |
Date: |
Thu, 14 Jun 2018 10:27:41 -0400 (EDT) |
branch: master
commit 15098dd5d1af0154ad5a2cec98322751b25422a1
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename icons paste-case*.png --> paste-in*.png
Renamed old 'paste-case' icons because pasting is being split into
'paste-in' and 'paste-out' operations ('paste-out' icons were
committed previously).
Normally one would expect such complementary operations to be named
'paste' and 'copy'. However, these 'paste-' operations are specialized;
to end users, they mean:
paste-in: import data from a spreadsheet to lmi
paste-out: export data to a spreadsheet from lmi
The clipboard is used, incidentally, only for the first operation.
The second operation writes certain data to a TSV file; it doesn't
use the clipboard or execute any spreadsheet program.
---
README | 2 +-
icon_monger.cpp | 3 ++-
menu_commands.html | 4 ++--
menus.xrc | 6 +++---
paste-case-16.png => paste-in-16.png | Bin
paste-case.png => paste-in.png | Bin
toolbar.xrc | 6 +++---
7 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/README b/README
index bf12847..cd7867f 100644
--- a/README
+++ b/README
@@ -44,7 +44,7 @@ sizes 24x24 and 16x16:
insert-rows[-16].png from stock_insert-rows.png
new[-16].png from stock_new.png
open[-16].png from stock_open.png
- paste-case[-16].png from stock_paste.png
+ paste-in[-16].png from stock_paste.png
paste-out[-16].png from stock_paste.png
preferences[-16].png from gnome-settings.png
print-case[-16].png from stock_print.png
diff --git a/icon_monger.cpp b/icon_monger.cpp
index fc14d77..9e8d5ff 100644
--- a/icon_monger.cpp
+++ b/icon_monger.cpp
@@ -85,7 +85,8 @@ icon_monger::icon_monger()
lmi_specific_icon_names_.insert("edit-cell" );
lmi_specific_icon_names_.insert("edit-class" );
lmi_specific_icon_names_.insert("fixed-width" );
- lmi_specific_icon_names_.insert("paste-case" );
+ lmi_specific_icon_names_.insert("paste-in" );
+ lmi_specific_icon_names_.insert("paste-out" );
lmi_specific_icon_names_.insert("preferences" );
lmi_specific_icon_names_.insert("print-case" );
lmi_specific_icon_names_.insert("print-case-pdf" );
diff --git a/menu_commands.html b/menu_commands.html
index 1a4b54f..9c043fe 100644
--- a/menu_commands.html
+++ b/menu_commands.html
@@ -312,9 +312,9 @@ Write a group premium quote to a PDF file. You can only do
this for
new business.
</p>
<p>
-<img src="paste-case.png" alt="[paste-case.png]">
+<img src="paste-in.png" alt="[paste-in.png]">
-<samp>Census | Paste census</samp>
+<samp>Census | Paste census in</samp>
</p>
<p>
Fill the census by
diff --git a/menus.xrc b/menus.xrc
index 2ef6127..b7a71d7 100644
--- a/menus.xrc
+++ b/menus.xrc
@@ -371,9 +371,9 @@
</object>
<object class="separator"/>
<object class="wxMenuItem" name="paste_census">
- <label>Pa_ste census\tCtrl-Shift-S</label>
- <bitmap platform="win" stock_id="paste-case"/>
- <help>Paste census data from clipboard</help>
+ <label>Pa_ste census in\tCtrl-Shift-S</label>
+ <bitmap platform="win" stock_id="paste-in"/>
+ <help>Paste census data in from clipboard</help>
</object>
<object class="wxMenuItem" name="add_cell">
<label>_Add cell\tCtrl-+</label>
diff --git a/paste-case-16.png b/paste-in-16.png
similarity index 100%
rename from paste-case-16.png
rename to paste-in-16.png
diff --git a/paste-case.png b/paste-in.png
similarity index 100%
rename from paste-case.png
rename to paste-in.png
diff --git a/toolbar.xrc b/toolbar.xrc
index 4fe337d..d7d3477 100644
--- a/toolbar.xrc
+++ b/toolbar.xrc
@@ -125,9 +125,9 @@
</object>
<object class="separator"/>
<object class="tool" name="paste_census">
- <tooltip>Paste census</tooltip>
- <bitmap stock_id="paste-case"/>
- <longhelp>Paste census data from clipboard</longhelp>
+ <tooltip>Paste census in</tooltip>
+ <bitmap stock_id="paste-in"/>
+ <longhelp>Paste census data in from clipboard</longhelp>
</object>
<object class="tool" name="add_cell">
<tooltip>Add cell</tooltip>
- [lmi-commits] [lmi] master updated (d17155c -> 73aeadc), Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 8a722b3 2/7: Refactor for concision, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 8044c50 1/7: Remove scaffolding, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 15098dd 4/7: Rename icons paste-case*.png --> paste-in*.png,
Greg Chicares <=
- [lmi-commits] [lmi] master 86ca5af 3/7: Fix defect introduced 20180228T1615Z: bad output filename, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master a22db84 6/7: Add census-paste-out commands to menu and toolbar, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 73aeadc 7/7: Remove no-longer-needed 'pyx=paste_out_to_spreadsheet' option, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master f964241 5/7: Adjust census-pasting XRCIDs, Greg Chicares, 2018/06/14