Author: mzugec
Date: Fri Apr 25 17:34:30 2008
New Revision: 47082
URL: http://svn.opensuse.org/viewcvs/yast?rev=47082&view=rev
Log:
fixed overview layout - adapt to DialogTree (FaTE#302133)
Modified:
trunk/printer/VERSION
trunk/printer/package/yast2-printer.changes
trunk/printer/src/common/dialogs-connection.ycp
trunk/printer/src/common/dialogs.ycp
trunk/printer/src/common/wizards.ycp
Modified: trunk/printer/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=47082&r1=47081&r2=47082&view=diff
==============================================================================
--- trunk/printer/VERSION (original)
+++ trunk/printer/VERSION Fri Apr 25 17:34:30 2008
@@ -1 +1 @@
-2.16.18
+2.16.19
Modified: trunk/printer/package/yast2-printer.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=47082&r1=47081&r2=47082&view=diff
==============================================================================
--- trunk/printer/package/yast2-printer.changes (original)
+++ trunk/printer/package/yast2-printer.changes Fri Apr 25 17:34:30 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Apr 25 17:28:12 CEST 2008 - mzugec@suse.cz
+
+- fixed overview layout - adapt to DialogTree (FaTE#302133)
+- 2.16.19
+
+-------------------------------------------------------------------
Thu Apr 24 15:41:20 CEST 2008 - mzugec@suse.cz
- updated data/printers_support (bnc#378233)
Modified: trunk/printer/src/common/dialogs-connection.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs-connection.ycp?rev=47082&r1=47081&r2=47082&view=diff
==============================================================================
--- trunk/printer/src/common/dialogs-connection.ycp (original)
+++ trunk/printer/src/common/dialogs-connection.ycp Fri Apr 25 17:34:30 2008
@@ -391,8 +391,10 @@
return `edit_button;
*/
}
-return nil;
- return `next;
+y2internal("ret %1", ret);
+if (retval!=nil) return (symbol)ret;
+ else return nil;
+// return `next;
}
/**
Modified: trunk/printer/src/common/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?rev=47082&r1=47081&r2=47082&view=diff
==============================================================================
--- trunk/printer/src/common/dialogs.ycp (original)
+++ trunk/printer/src/common/dialogs.ycp Fri Apr 25 17:34:30 2008
@@ -29,7 +29,7 @@
import "Wizard";
// import "Wizard_hw";
import "CWMTab";
-// import "DialogTree";
+ import "DialogTree";
import "CWM";
import "IP";
@@ -82,22 +82,14 @@
list model_val = [];
term modelsel = nil;
- term contents = `VBox (`HBox (`HWeight (1, manufsel),
- `HWeight (1, `ReplacePoint (`id (`modelsel_rep), `HSpacing ()))),
- `HBox (
- `HStretch (),
-/*
- `MenuButton (`id (`other_ppd), _("Add &PPD File to Database"), [
- `item (`id (`specifyppd), _("&Local PPD File")),
- `item (`id (`downloadppd), _("&Download PPD File")),
- ]),
- `PushButton (`id (`select_ppd), _("Select PPD File")),
-*/
+ term contents = `VBox (`HBox (`HWeight(10, manufsel),
+ `ReplacePoint (`id (`modelsel_rep), `HSpacing ())),
`HBox(
+ `HSpacing(),
`PushButton(`id(`cancel), Label::CancelButton()),
- `HStretch(),
- `PushButton(`id(`next), Label::OKButton()))
- ));
+ `PushButton(`id(`next), Label::OKButton())),
+ `HSpacing()
+ );
// dialog box label
Wizard::SetContentsButtons (_("Printer Model"),
contents, getManufModelHelp (), Label::CancelButton (),
@@ -174,11 +166,7 @@
y2debug ("modelsel changed to %1", model_db);
}
ret = (symbol)UI::UserInput ();
- if (`abort == ret || `cancel == ret)
- {
- ret = reallyAbort () ? `abort : `cont;
- if (ret == `abort) break;
- }
+ if (ret == `cancel) break;
if (ret == `next && (model_db == "" || model_db == nil))
{
// popup
@@ -2028,7 +2016,6 @@
UI::ChangeWidget (`id (`_hw_items), `Items, items);
if (size((items))>0) selected = tointeger( UI::QueryWidget(`id(`_hw_items), `CurrentItem));
}
-y2internal("selected %1", selected);
boolean editable = (selected==nil || selected==-1) ? false : true;
if (size((list<term>)UI::QueryWidget(`id (`_hw_items), `Items))>0)
{
@@ -2066,7 +2053,6 @@
integer selected = -1;
if (size((list<term>)UI::QueryWidget(`id (`_hw_items), `Items))>0) selected = tointeger( UI::QueryWidget(`id(`_hw_items), `CurrentItem));
Printer::selectPrinter(selected);
-y2internal("event %1", event);
refreshOverview(selected, (event["EventReason"]:nil=="SelectionChanged"||event["ID"]:nil==`delete||event["ID"]:nil==`edit)?false:true);
y2milestone("selected printer %1", selected);
if (new_spooler == "cups" && CUPS::InstallationType () == `client) new_spooler = "cups-client";
@@ -2363,7 +2349,8 @@
), `HSpacing (2)),
"init" : initCupsServer,
"handle" : handleCupsServer,
- "store" : storeCupsServer
+ "store" : storeCupsServer,
+ "help" : getCupsServerHelp()
]
];
@@ -2397,6 +2384,7 @@
symbol runMainDialog(){
string caption = _("Detected Printers");
+/*
map widget_descr = $[
"tab": CWMTab::CreateWidget($[
"tab_order": [ "global", "overview", "server" ],
@@ -2416,18 +2404,19 @@
Wizard::DisableBackButton();
symbol ret = CWM::Run(w, $[]);
-/*
+*/
+
symbol ret = DialogTree::ShowAndRun ($[
"ids_order" : [ "global", "overview", "server" ],
"initial_screen" : initial_tab,
"screens" : tabs_descr,
"widget_descr" : wd,
+ "back_button" : nil,//Label::BackButton(),
"abort_button" : Label::AbortButton(),
"next_button" : (Mode::normal() ?
Label::NextButton () : Label::OKButton ()
)
]);
-*/
return ret;
}
@@ -2559,14 +2548,16 @@
symbol handleOptions(string key, map event){
- y2internal("event %1", event);
if (event["EventReason"]:""=="Activated" && event["ID"]:nil==`more_driver_options){
y2internal("show popup");
UI::OpenDialog(`VBox(
`ReplacePoint (`id (`contents), `VSpacing (1)),
`HBox(
+ `HSpacing(5),
`PushButton(`id(`cancel), Label::CancelButton()),
- `PushButton(`id(`next), Label::OKButton())))
+ `PushButton(`id(`next), Label::OKButton()),
+ `HSpacing(5)
+ ))
);
runOptionsDialog();
UI::CloseDialog();
@@ -2578,7 +2569,6 @@
}
void storeOptions(string key, map event){
-y2internal("storing");
string info = (string)UI::QueryWidget(`description, `Value);
string loc = (string)UI::QueryWidget(`location, `Value);
Printer::printer["info"] = info;
@@ -2600,7 +2590,6 @@
Printerdb::InstallDrivers ();
Printerdb::loadFoomaticIfNeeded ();
-y2internal("printer %1", Printer::printer);
string manuf_db = Printer::printer["ppd_info", "manufacturer_db"]:"";
string model_db = Printer::printer["ppd_info", "model_db"]:"";
y2internal("manuf_db %1, model_db %2", manuf_db, model_db);
@@ -2628,16 +2617,10 @@
symbol handleBasic(string key, map event){
if (event["EventReason"]:""=="Activated" && event["WidgetID"]:nil==`change_conn){
term contents = `VBox(
- `ReplacePoint(`id(`contents),
- `VBox(
- `Frame(_("New Queue for Existing Printer"),
- `VBox(
- `SelectionBox(`id(`connection_type), _("Printer"),
- []
- ))))),
- `HBox(
- `PushButton(`id(`cancel), Label::CancelButton()),
- `PushButton(`id(`next), Label::OKButton()))
+ `ReplacePoint(`id(`contents), `Empty()),
+ `HBox(
+ `PushButton(`id(`cancel), Label::CancelButton()),
+ `PushButton(`id(`next), Label::OKButton()))
);
UI::OpenDialog(contents);
runNewQueueDialog(nil);
@@ -2649,11 +2632,7 @@
ManufModelPopup();
UI::CloseDialog();
initBasic("");
-// runSelectPpdFile();
}
-// if (event["EventReason"]:""=="Activated" && event["WidgetID"]:nil==`conn_wizard){
-//runSelectPpdFile();
-// }
return nil;
}
@@ -2661,13 +2640,6 @@
y2internal("changed ppd %1", UI::QueryWidget(`drivers, `CurrentItem));
string manuf_db = Printer::printer["ppd_info", "manufacturer_db"]:"";
string model_db = Printer::printer["ppd_info", "model_db"]:"";
-/*
- string file = Printerdb::getFileFromNickName (
- manuf_db, model_db,
- Printer::printer["ppd_info", "nick"]:"",
- Printer::printer["ppd_info", "language"]:""
- );
-*/
string file = (string)UI::QueryWidget (`drivers, `CurrentItem);
y2internal("new file %1", file);
Printer::printer["options"] = $[];
Modified: trunk/printer/src/common/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/wizards.ycp?rev=47082&r1=47081&r2=47082&view=diff
==============================================================================
--- trunk/printer/src/common/wizards.ycp (original)
+++ trunk/printer/src/common/wizards.ycp Fri Apr 25 17:34:30 2008
@@ -261,14 +261,7 @@
"edit2" : $[
`next : `next,
`abort: `abort
-// `add : "add_printer_sub_wz"
]
-/*
- "add_printer_sub_wz" : $[
- `next : `next,
- `abort: `abort
- ]
-*/
];
// if (configured == false) sequence["ws_start"] = "model";
aliases = (map