sync from upstream up to 22:14a375563e2b
This includes the following commits: changeset: 22:14a375563e2b summary: chang "while" command to "type -P" in bash based configure changeset: 21:c4bf7c0f33d2 summary: updated codec paper for RS01 life cycle changeset: 20:dbcaad8128aa summary: replaced build count with mercurial changeset changeset: 19:fba258a6acfa summary: Added tag 0.79.10 for changeset 49950be5a2ef changeset: 18:49950be5a2ef summary: merged some debian patches changeset: 17:815be3929c41 summary: merged "easy" patches from Stéphane Lesimple's version changeset: 16:7d15f8a958cb summary: Made printf format strings 32/64bit safe as suggested by Stéphane; changeset: 15:1055a53b8d6d summary: reorganized code for --with-gui=[yes|no] option changeset: 14:fbe2ae12a32c summary: Added tag 0.79.9 for changeset f2fdd6d3a1f5 changeset: 13:f2fdd6d3a1f5 summary: updated TODO and CHANGELOG And other changes that were needed to resolve the (many) conflicts.
This commit is contained in:
Stéphane Lesimple
@@ -19,7 +19,10 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with dvdisaster. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
// DVDISASTER_GUI_FILE
|
||||
|
||||
/*** src type: only GUI code ***/
|
||||
|
||||
#ifdef WITH_GUI_YES
|
||||
|
||||
#include "dvdisaster.h"
|
||||
|
||||
@@ -41,8 +44,8 @@ static void update_geometry(RS02Widgets*);
|
||||
void ResetRS02EncWindow(Method *method)
|
||||
{ RS02Widgets *wl = (RS02Widgets*)method->widgetList;
|
||||
|
||||
SetProgress(wl->encPBar1, 0, 100);
|
||||
SetProgress(wl->encPBar2, 0, 100);
|
||||
GuiSetProgress(wl->encPBar1, 0, 100);
|
||||
GuiSetProgress(wl->encPBar2, 0, 100);
|
||||
|
||||
gtk_widget_hide(wl->encLabel2);
|
||||
gtk_widget_hide(wl->encPBar2);
|
||||
@@ -53,13 +56,7 @@ void ResetRS02EncWindow(Method *method)
|
||||
|
||||
void CreateRS02EncWindow(Method *method, GtkWidget *parent)
|
||||
{ GtkWidget *wid,*table,*pbar,*sep;
|
||||
RS02Widgets *wl;
|
||||
|
||||
if(!method->widgetList)
|
||||
{ wl = g_malloc0(sizeof(RS02Widgets));
|
||||
method->widgetList = wl;
|
||||
}
|
||||
else wl = method->widgetList;
|
||||
RS02Widgets *wl = method->widgetList;
|
||||
|
||||
wl->encHeadline = gtk_label_new(NULL);
|
||||
gtk_misc_set_alignment(GTK_MISC(wl->encHeadline), 0.0, 0.0);
|
||||
@@ -76,8 +73,7 @@ void CreateRS02EncWindow(Method *method, GtkWidget *parent)
|
||||
gtk_box_pack_start(GTK_BOX(parent), table, FALSE, FALSE, 30);
|
||||
|
||||
wl->encLabel1 = wid = gtk_label_new(NULL);
|
||||
gtk_label_set_markup(GTK_LABEL(wid),
|
||||
_utf("<b>1. Preparing image:</b>"));
|
||||
gtk_label_set_markup(GTK_LABEL(wid),_utf("<b>1. Preparing image:</b>"));
|
||||
gtk_misc_set_alignment(GTK_MISC(wid), 0.0, 0.0);
|
||||
gtk_table_attach(GTK_TABLE(table), wid, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 20, 20);
|
||||
|
||||
@@ -138,9 +134,12 @@ void RS02SetFixMaxValues(RS02Widgets *wl, int data_bytes, int ecc_bytes, gint64
|
||||
static gboolean results_idle_func(gpointer data)
|
||||
{ RS02Widgets *wl = (RS02Widgets*)data;
|
||||
|
||||
SetLabelText(GTK_LABEL(wl->fixCorrected), _("Repaired: %" PRId64 ""), wl->corrected);
|
||||
SetLabelText(GTK_LABEL(wl->fixUncorrected), _("Unrepairable: <span %s>%" PRId64 "</span>"),Closure->redMarkup, wl->uncorrected);
|
||||
SetLabelText(GTK_LABEL(wl->fixProgress), _("Progress: %3d.%1d%%"), wl->percent/10, wl->percent%10);
|
||||
GuiSetLabelText(wl->fixCorrected, _("Repaired: %" PRId64),
|
||||
wl->corrected);
|
||||
GuiSetLabelText(wl->fixUncorrected, _("Unrepairable: <span %s>%" PRId64 "</span>"),
|
||||
Closure->redMarkup, wl->uncorrected);
|
||||
GuiSetLabelText(wl->fixProgress, _("Progress: %3d.%1d%%"),
|
||||
wl->percent/10, wl->percent%10);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
@@ -159,9 +158,9 @@ void RS02UpdateFixResults(RS02Widgets *wl, gint64 corrected, gint64 uncorrected)
|
||||
|
||||
static gboolean curve_idle_func(gpointer data)
|
||||
{ RS02Widgets *wl = (RS02Widgets*)data;
|
||||
gint x0 = CurveX(wl->fixCurve, (double)wl->lastPercent);
|
||||
gint x1 = CurveX(wl->fixCurve, (double)wl->percent);
|
||||
gint y = CurveY(wl->fixCurve, wl->fixCurve->ivalue[wl->percent]);
|
||||
gint x0 = GuiCurveX(wl->fixCurve, (double)wl->lastPercent);
|
||||
gint x1 = GuiCurveX(wl->fixCurve, (double)wl->percent);
|
||||
gint y = GuiCurveY(wl->fixCurve, wl->fixCurve->ivalue[wl->percent]);
|
||||
gint i;
|
||||
|
||||
/*** Mark unused ecc values */
|
||||
@@ -195,7 +194,7 @@ static gboolean curve_idle_func(gpointer data)
|
||||
|
||||
/* Redraw the ecc capacity threshold line */
|
||||
|
||||
y = CurveY(wl->fixCurve, wl->eccBytes);
|
||||
y = GuiCurveY(wl->fixCurve, wl->eccBytes);
|
||||
gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector);
|
||||
gdk_draw_line(wl->fixCurve->widget->window,
|
||||
Closure->drawGC,
|
||||
@@ -227,7 +226,7 @@ static void update_geometry(RS02Widgets *wl)
|
||||
{
|
||||
/* Curve geometry */
|
||||
|
||||
UpdateCurveGeometry(wl->fixCurve, "999", 20);
|
||||
GuiUpdateCurveGeometry(wl->fixCurve, "999", 20);
|
||||
|
||||
/* Label positions in the foot line */
|
||||
|
||||
@@ -242,12 +241,12 @@ static void redraw_curve(RS02Widgets *wl)
|
||||
|
||||
/* Redraw the curve */
|
||||
|
||||
RedrawAxes(wl->fixCurve);
|
||||
RedrawCurve(wl->fixCurve, wl->percent);
|
||||
GuiRedrawAxes(wl->fixCurve);
|
||||
GuiRedrawCurve(wl->fixCurve, wl->percent);
|
||||
|
||||
/* Ecc capacity threshold line */
|
||||
|
||||
y = CurveY(wl->fixCurve, wl->eccBytes);
|
||||
y = GuiCurveY(wl->fixCurve, wl->eccBytes);
|
||||
gdk_gc_set_rgb_fg_color(Closure->drawGC, Closure->greenSector);
|
||||
gdk_draw_line(wl->fixCurve->widget->window,
|
||||
Closure->drawGC,
|
||||
@@ -275,7 +274,7 @@ void ResetRS02FixWindow(Method *method)
|
||||
|
||||
gtk_notebook_set_current_page(GTK_NOTEBOOK(wl->fixNotebook), 0);
|
||||
|
||||
ZeroCurve(wl->fixCurve);
|
||||
GuiZeroCurve(wl->fixCurve);
|
||||
RS02UpdateFixResults(wl, 0, 0);
|
||||
|
||||
if(wl->fixCurve && wl->fixCurve->widget)
|
||||
@@ -291,7 +290,6 @@ void ResetRS02FixWindow(Method *method)
|
||||
* Create the Fix window contents
|
||||
*/
|
||||
|
||||
|
||||
void CreateRS02FixWindow(Method *method, GtkWidget *parent)
|
||||
{ RS02Widgets *wl;
|
||||
GtkWidget *sep,*ignore,*d_area,*notebook,*hbox;
|
||||
@@ -345,7 +343,7 @@ void CreateRS02FixWindow(Method *method, GtkWidget *parent)
|
||||
ignore = gtk_label_new("footer_tab");
|
||||
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), wl->fixFootline, ignore);
|
||||
|
||||
wl->fixCurve = CreateCurve(d_area, _("Errors/Ecc block"), "%d", 1000, CURVE_PERCENT);
|
||||
wl->fixCurve = GuiCreateCurve(d_area, _("Errors/Ecc block"), "%d", 1000, CURVE_PERCENT);
|
||||
wl->fixCurve->enable = DRAW_ICURVE;
|
||||
}
|
||||
|
||||
@@ -396,8 +394,8 @@ static void cache_cb(GtkWidget *widget, gpointer data)
|
||||
utf = g_locale_to_utf8(text, -1, NULL, NULL, NULL);
|
||||
gtk_label_set_markup(GTK_LABEL(lwoh->normalLabel), utf);
|
||||
gtk_label_set_markup(GTK_LABEL(lwoh->linkLabel), utf);
|
||||
SetOnlineHelpLinkText(lwoh, text);
|
||||
UpdateMethodPreferences();
|
||||
GuiSetOnlineHelpLinkText(lwoh, text);
|
||||
GuiUpdateMethodPreferences();
|
||||
g_free(text);
|
||||
g_free(utf);
|
||||
}
|
||||
@@ -781,8 +779,9 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
|
||||
/* Drive capacity table header */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("Using the smallest possible size from table"), _("Use smallest possible size from following table (in sectors):"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("Using the smallest possible size from table"),
|
||||
_("Use smallest possible size from following table (in sectors):"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
vbox2 = gtk_vbox_new(FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), vbox2, FALSE, FALSE, 0);
|
||||
@@ -801,20 +800,21 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
wl->radio1B = radio;
|
||||
gtk_box_pack_start(GTK_BOX(hbox), radio, FALSE, FALSE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
}
|
||||
}
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Determine augmented image size from table</b>\n\n"
|
||||
"Augmented images fill up unused medium space "
|
||||
"with error correction information. Activate this option "
|
||||
"if you want the augmented image to fit on the smallest "
|
||||
"possible medium.\n\n"
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>Determine augmented image size from table</b>\n\n"
|
||||
"Augmented images fill up unused medium space "
|
||||
"with error correction information. Activate this option "
|
||||
"if you want the augmented image to fit on the smallest "
|
||||
"possible medium.\n\n"
|
||||
|
||||
"In order to pick a suitable medium the available media "
|
||||
"capacities must be known. Default sizes for CD and "
|
||||
"one/two layered DVD and BD are given in the table. You can edit "
|
||||
"these sizes according to your needs."));
|
||||
"In order to pick a suitable medium the available media "
|
||||
"capacities must be known. Default sizes for CD and "
|
||||
"one/two layered DVD and BD are given in the table. You can edit "
|
||||
"these sizes according to your needs."));
|
||||
|
||||
table = gtk_table_new(5, 6, FALSE);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), table, FALSE, FALSE, 0);
|
||||
@@ -827,8 +827,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
|
||||
/* CD capacity table row */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("CD-R / CD-RW:"), _("CD-R / CD-RW:"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("CD-R / CD-RW:"), _("CD-R / CD-RW:"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
|
||||
tinybox = gtk_hbox_new(FALSE, 0);
|
||||
@@ -870,28 +870,29 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
g_signal_connect(G_OBJECT(wl->cdUndoButtonB), "clicked", G_CALLBACK(query_cb), wl);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), wl->cdUndoButtonB, FALSE, FALSE, 0);
|
||||
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>CD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for 80min CD media. "
|
||||
"Images smaller than this value will be "
|
||||
"augmented with error correction information "
|
||||
"so that they will fit on the specified CD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a medium currently inserted in the selected "
|
||||
"drive. Sometimes this value is incorrect, though.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>CD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for 80min CD media. "
|
||||
"Images smaller than this value will be "
|
||||
"augmented with error correction information "
|
||||
"so that they will fit on the specified CD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a medium currently inserted in the selected "
|
||||
"drive. Sometimes this value is incorrect, though.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
|
||||
/* DVD capacity table row */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("DVD 1 layer:"), _("DVD 1 layer:"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("DVD 1 layer:"), _("DVD 1 layer:"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
|
||||
tinybox = gtk_hbox_new(FALSE, 0);
|
||||
@@ -933,28 +934,29 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
g_signal_connect(G_OBJECT(wl->dvdUndoButton1B), "clicked", G_CALLBACK(query_cb), wl);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), wl->dvdUndoButton1B, FALSE, FALSE, 0);
|
||||
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Single layer DVD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for single layer DVD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified DVD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a medium currently inserted in the selected "
|
||||
"drive. Sometimes this value is incorrect, though.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>Single layer DVD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for single layer DVD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified DVD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a medium currently inserted in the selected "
|
||||
"drive. Sometimes this value is incorrect, though.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
|
||||
/* DVD two layer capacity table row */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("DVD 2 layers:"), _("DVD 2 layers:"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("DVD 2 layers:"), _("DVD 2 layers:"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
|
||||
tinybox = gtk_hbox_new(FALSE, 0);
|
||||
@@ -996,28 +998,29 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
g_signal_connect(G_OBJECT(wl->dvdUndoButton2B), "clicked", G_CALLBACK(query_cb), wl);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), wl->dvdUndoButton2B, FALSE, FALSE, 0);
|
||||
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Two layered DVD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for two layered DVD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified DVD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a medium currently inserted in the selected "
|
||||
"drive. Sometimes this value is incorrect, though.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>Two layered DVD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for two layered DVD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified DVD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a medium currently inserted in the selected "
|
||||
"drive. Sometimes this value is incorrect, though.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
|
||||
/* BD capacity table row */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("BD 1 layer:"), _("BD 1 layer:"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("BD 1 layer:"), _("BD 1 layer:"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
|
||||
tinybox = gtk_hbox_new(FALSE, 0);
|
||||
@@ -1059,27 +1062,28 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
g_signal_connect(G_OBJECT(wl->bdUndoButton1B), "clicked", G_CALLBACK(query_cb), wl);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), wl->bdUndoButton1B, FALSE, FALSE, 0);
|
||||
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Single layer BD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for single layer BD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified BD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a blank medium currently inserted in the selected drive.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>Single layer BD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for single layer BD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified BD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a blank medium currently inserted in the selected drive.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
|
||||
/* BD two layer capacity table row */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("BD 2 layers:"), _("BD 2 layers:"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("BD 2 layers:"), _("BD 2 layers:"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
|
||||
tinybox = gtk_hbox_new(FALSE, 0);
|
||||
@@ -1121,27 +1125,28 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
g_signal_connect(G_OBJECT(wl->bdUndoButton2B), "clicked", G_CALLBACK(query_cb), wl);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), wl->bdUndoButton2B, FALSE, FALSE, 0);
|
||||
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Two layered BD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for two layered BD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified BD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a blank medium currently inserted in the selected drive.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>Two layered BD medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for two layered BD media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified BD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a blank medium currently inserted in the selected drive.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
|
||||
/* BDXL three layer capacity table row */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("BDXL 3 layers:"), _("BDXL 3 layers:"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("BDXL 3 layers:"), _("BDXL 3 layers:"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
|
||||
tinybox = gtk_hbox_new(FALSE, 0);
|
||||
@@ -1183,29 +1188,30 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
g_signal_connect(G_OBJECT(wl->bdUndoButton3B), "clicked", G_CALLBACK(query_cb), wl);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), wl->bdUndoButton3B, FALSE, FALSE, 0);
|
||||
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Three layered BDXL medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for three layered BDXL media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified BD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a blank medium currently inserted in the selected drive.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>Three layered BDXL medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for three layered BDXL media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
"so that they will fit on the specified BD.\n\n"
|
||||
"You can enter the medium size in sectors of 2K each, "
|
||||
"or press the \"query medium\" button to use the size "
|
||||
"of a blank medium currently inserted in the selected drive.\n"
|
||||
"Use the arrow button to revert to the last saved value.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
|
||||
|
||||
|
||||
/* BDXL four layer capacity table row */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("BDXL 4 layers:"), _("BDXL 4 layers:"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("BDXL 4 layers:"), _("BDXL 4 layers:"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
gtk_misc_set_alignment(GTK_MISC(lwoh->linkLabel), 0.0, 0.0);
|
||||
tinybox = gtk_hbox_new(FALSE, 0);
|
||||
@@ -1247,9 +1253,9 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
g_signal_connect(G_OBJECT(wl->bdUndoButton4B), "clicked", G_CALLBACK(query_cb), wl);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), wl->bdUndoButton4B, FALSE, FALSE, 0);
|
||||
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Four layered BDXL medium size</b>\n\n"
|
||||
GuiAddHelpParagraph(lwoh, _("<b>Four layered BDXL medium size</b>\n\n"
|
||||
"This is the maximum capacity assumed for four layered BDXL media. "
|
||||
"Images exceeding the smaller media sizes but smaller "
|
||||
"than this value will be augmented with error correction information "
|
||||
@@ -1290,8 +1296,8 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
|
||||
/* custom value selection */
|
||||
|
||||
lwoh = CreateLabelWithOnlineHelp(_("Use at most"), _("Use at most"));
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("Use at most"), _("Use at most"));
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
|
||||
for(i=0; i<2; i++)
|
||||
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
|
||||
@@ -1320,22 +1326,23 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
}
|
||||
else
|
||||
{ wl->otherEntryB = entry;
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
}
|
||||
}
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>Use at most ... sectors</b>\n\n"
|
||||
"Use this option to override the table settings; "
|
||||
"the augmented image will be expanded to the size "
|
||||
"given in this field.\n"
|
||||
"This allows for the creation of DVD-sized augmented images "
|
||||
"which would normally be fitted to CD size, and to use "
|
||||
"non standard media.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>Use at most ... sectors</b>\n\n"
|
||||
"Use this option to override the table settings; "
|
||||
"the augmented image will be expanded to the size "
|
||||
"given in this field.\n"
|
||||
"This allows for the creation of DVD-sized augmented images "
|
||||
"which would normally be fitted to CD size, and to use "
|
||||
"non standard media.\n\n"
|
||||
"Please note that augmented images will at most triple "
|
||||
"in size as the highest possible redundancy is 200%%.\n"
|
||||
"Even if this limit is not reached the augmented image "
|
||||
"may be a few sectors smaller than specified for "
|
||||
"technical reasons."));
|
||||
|
||||
g_snprintf(value, 40, "%lld", (long long int)Closure->mediumSize);
|
||||
gtk_entry_set_text(GTK_ENTRY(wl->otherEntryA), value);
|
||||
@@ -1360,13 +1367,13 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
gtk_box_pack_start(GTK_BOX(parent), frame, FALSE, FALSE, 0);
|
||||
|
||||
text = g_strdup_printf(_("%d MiB of file cache"), Closure->cacheMiB);
|
||||
lwoh = CreateLabelWithOnlineHelp(_("File cache"), text);
|
||||
RegisterPreferencesHelpWindow(lwoh);
|
||||
lwoh = GuiCreateLabelWithOnlineHelp(_("File cache"), text);
|
||||
GuiRegisterPreferencesHelpWindow(lwoh);
|
||||
g_free(text);
|
||||
|
||||
wl->cacheLwoh = lwoh;
|
||||
LockLabelSize(GTK_LABEL(lwoh->normalLabel), _utf("%d MiB of file cache"), 2222);
|
||||
LockLabelSize(GTK_LABEL(lwoh->linkLabel), _utf("%d MiB of file cache"), 2222);
|
||||
GuiLockLabelSize(lwoh->normalLabel, _utf("%d MiB of file cache"), 2222);
|
||||
GuiLockLabelSize(lwoh->linkLabel, _utf("%d MiB of file cache"), 2222);
|
||||
|
||||
for(i=0; i<2; i++)
|
||||
{ GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
|
||||
@@ -1397,12 +1404,15 @@ void CreateRS02PrefsPage(Method *method, GtkWidget *parent)
|
||||
else
|
||||
{ wl->cacheScaleB = scale;
|
||||
gtk_box_pack_start(GTK_BOX(hbox), lwoh->normalLabel, FALSE, FALSE, 0);
|
||||
AddHelpWidget(lwoh, hbox);
|
||||
GuiAddHelpWidget(lwoh, hbox);
|
||||
}
|
||||
}
|
||||
|
||||
AddHelpParagraph(lwoh, _("<b>File cache</b>\n\n"
|
||||
"dvdisaster optimizes access to the image and error correction "
|
||||
"files by maintaining its own cache. "
|
||||
"The preset of 32MiB is suitable for most systems."));
|
||||
GuiAddHelpParagraph(lwoh,
|
||||
_("<b>File cache</b>\n\n"
|
||||
"dvdisaster optimizes access to the image and error correction "
|
||||
"files by maintaining its own cache. "
|
||||
"The preset of 32MiB is suitable for most systems."));
|
||||
}
|
||||
|
||||
#endif /* WITH_GUI_YES */
|
||||
|
||||
Reference in New Issue
Block a user