Rework custom media size support to remember the last size for each s…

…ource.
michaelrsweet · Dec 7, 2023 · 77b1080 · 77b1080
1 parent 7a96972
commit 77b1080
Show file tree

Hide file tree

Showing 8 changed files with 159 additions and 239 deletions.
diff --git a/lprint-common.c b/lprint-common.c
diff --git a/lprint.h b/lprint.h
@@ -135,15 +135,11 @@ typedef struct lprint_dither_s		// Dithering state
   unsigned	out_width;		// Output width in bytes
 } lprint_dither_t;
 
-typedef struct lprint_media_s		// Custom label sizes (per-printer)
+typedef struct lprint_cmedia_s		// Custom label sizes (per-printer/source)
 {
-#  ifndef _WIN32
-  pthread_rwlock_t rwlock;		// Reader/writer lock
-#  endif // !_WIN32
-  int		num_media;		// Number of custom media size names
-  char		media[LPRINT_MAX_CUSTOM][128];
+  char		custom_name[PAPPL_MAX_SOURCE][128];
 					// Custom media size names
-} lprint_media_t;
+} lprint_cmedia_t;
 
 
 //

diff --git a/static-resources/lprint-de.strings b/static-resources/lprint-de.strings
@@ -141,4 +141,3 @@
 "media.om_vhs-face_45x72mm" = "45 x 72mm VHS Face Label";
 "media.om_vhs-spine_18x141mm" = "18 x 141mm VHS Spine Label";
 "media.om_zip-disk_48x55mm" = "48 x 55mm Zip Disk Label";
-"Delete %s?" = "Delete %s";
diff --git a/static-resources/lprint-en.strings b/static-resources/lprint-en.strings
@@ -141,4 +141,3 @@
 "media.om_vhs-face_45x72mm" = "45 x 72mm VHS Face Label";
 "media.om_vhs-spine_18x141mm" = "18 x 141mm VHS Spine Label";
 "media.om_zip-disk_48x55mm" = "48 x 55mm Zip Disk Label";
-"Delete %s?" = "Delete %s";
diff --git a/static-resources/lprint-es.strings b/static-resources/lprint-es.strings
@@ -141,4 +141,3 @@
 "media.om_vhs-face_45x72mm" = "45 x 72mm VHS Face Label";
 "media.om_vhs-spine_18x141mm" = "18 x 141mm VHS Spine Label";
 "media.om_zip-disk_48x55mm" = "48 x 55mm Zip Disk Label";
-"Delete %s?" = "Delete %s";
diff --git a/static-resources/lprint-fr.strings b/static-resources/lprint-fr.strings
@@ -141,4 +141,3 @@
 "media.om_vhs-face_45x72mm" = "45 x 72mm VHS Face Label";
 "media.om_vhs-spine_18x141mm" = "18 x 141mm VHS Spine Label";
 "media.om_zip-disk_48x55mm" = "48 x 55mm Zip Disk Label";
-"Delete %s?" = "Delete %s";
diff --git a/static-resources/lprint-it.strings b/static-resources/lprint-it.strings
@@ -141,4 +141,3 @@
 "media.om_vhs-face_45x72mm" = "45 x 72mm VHS Face Label";
 "media.om_vhs-spine_18x141mm" = "18 x 141mm VHS Spine Label";
 "media.om_zip-disk_48x55mm" = "48 x 55mm Zip Disk Label";
-"Delete %s?" = "Delete %s";
diff --git a/static-resources/lprint.css b/static-resources/lprint.css
@@ -203,44 +203,6 @@ label.switch input {
   height: 0;
 }
 
-.radio-list input[type="radio"] {
-  display: none;
-}
-.radio-list label.radio-label {
-  background-color: #eee;
-  border: 1px solid rgba(0,0,0,0.2);
-  border-bottom: none;
-  cursor: pointer;
-  display: inline-block;
-  padding: 2px 10px;
-  width: 14em;
-  transition: all 0.2s ease-in-out;
-}
-.radio-list input[type="radio"]:checked + label.radio-label {
-  background-color: #777;
-  color: white;
-}
-.radio-list:first-child label.radio-label {
-  border-radius: 5px 5px 0 0;
-}
-.radio-list:nth-last-child(2) label.radio-label {
-  border-bottom: 1px solid rgba(0,0,0,0.2);
-  border-radius: 0 0 5px 5px;
-}
-button.radio-action {
-  background: none;
-  border: none;
-  color: black;
-  float: right;
-}
-.radio-list input[type="radio"]:checked + label.radio-label button.radio-action {
-  color: white;
-}
-button.radio-action:hover, button.radio-action:active {
-  background: #777;
-  color: #eee;
-}
-
 img.password-show, img.password-hide {
   cursor: pointer;
   margin-left: -25px;
@@ -597,26 +559,6 @@ table.meter th {
     color: #333;
   }
 
-  .radio-list label.radio-label {
-    background-color: #333;
-    border: 1px solid rgba(191,191,191,0.2);
-  }
-  .radio-list input[type="radio"]:checked + label.radio-label {
-    background-color: rgba(112,112,112,0.5);
-    color: #ccc;
-  }
-  .radio-list:nth-last-child(2) label.radio-label {
-    border-bottom: 1px solid rgba(191,191,191,0.2);
-  }
-  .radio-list input[type="radio"]:checked + label.radio-label button.radio-action, button.radio-action {
-    color: #ccc;
-  }
-  button.radio-action:hover, button.radio-action:active {
-    background: rgba(112,112,112, 0.75);
-    border: none;
-    color: #eee;
-  }
-
   table.list {
     border-bottom: solid thin #ccc;
   }