[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : alex
Repository : xara
Revision : 1362
Date : Sun Jun 25 18:49:12 BST 2006
Changed paths:
M /Trunk/XaraLX/Kernel/prnprefs.cpp
M /Trunk/XaraLX/Kernel/prnprefs.h
M /Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
A /Trunk/XaraLX/wxOil/xrc/IDD_OPTSTAB_PRINTGENERAL.png
A /Trunk/XaraLX/wxOil/xrc/IDD_OPTSTAB_PRINTLAYOUT.png
Tidied up printer preferences dialog
Diff:
Index: Trunk/XaraLX/Kernel/prnprefs.cpp
===================================================================
--- Trunk/XaraLX/Kernel/prnprefs.cpp (revision 1361)
+++ Trunk/XaraLX/Kernel/prnprefs.cpp (revision 1362)
@@ -592,11 +592,6 @@
OptionsTabs::GreyApplyNow();
}
- // Allow the base class access to the message, it will do the
- // DLG_EAT_IF_HUNGRY(Msg) for us
- // Must do this before the Close and End
- Result = DialogTabOp::Message(Message);
-
// End dialog here
if (EndDialog)
{
@@ -617,9 +612,14 @@
// Make sure that we remove our options tabs link to the dialog box class
// as the dialog will now be destroyed
OptionsTabs::pPrefsDlg = NULL;
- return Result;
+ return OK;
}
+ // Allow the base class access to the message, it will do the
+ // DLG_EAT_IF_HUNGRY(Msg) for us
+ // Must do this before the Close and End
+ Result = DialogTabOp::Message(Message);
+
// Check if have been sending an init/create message and if so then set flag False.
// Only do this in the init/create case as we might be sent one of these and then
// be sent other messages whilst in the middle of the init/create message such as
Index: Trunk/XaraLX/Kernel/prnprefs.h
===================================================================
--- Trunk/XaraLX/Kernel/prnprefs.h (revision 1361)
+++ Trunk/XaraLX/Kernel/prnprefs.h (revision 1362)
@@ -153,6 +153,9 @@
static void SetCurrentDlg(PrintPrefsDlg* pDlg); // Access to the current open dlg
static void CloseCurrentDlg(); // Forces the dlg to close
+ BOOL HasImages() {return TRUE;}
+ TabType GetTabType() {return TABTYPE_TREE/*TABTYPE_LIST*/;}
+
private:
// Set up explicit details about this dialog box such as the id and type
static const CDlgResID IDD; // Dialog box id
Index: Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 1361)
+++ Trunk/XaraLX/wxOil/xrc/EN/printdlg.xrc (revision 1362)
@@ -2,12 +2,31 @@
<resource>
<object class="wxPanel" name="IDD_OPTSTAB_PRINTLAYOUT">
<pos>0,0d</pos> <size>206,188d</size>
+ <object class="wxStaticLine" name="IDC_PLAYOUTLINE1">
+ <size>400,-1</size>
+ <pos>6,190</pos>
+ <style>wxLI_HORIZONTAL</style>
+ </object>
+ <object class="wxStaticLine" name="IDC_PLAYOUTLINE2">
+ <size>400,-1</size>
+ <pos>6,230</pos>
+ <style>wxLI_HORIZONTAL</style>
+ </object>
+ <object class="wxStaticLine" name="IDC_PLAYOUTLINE3">
+ <size>400,-1</size>
+ <pos>6,315</pos>
+ <style>wxLI_HORIZONTAL</style>
+ </object>
<object class="wxCamArtControl" name="IDC_BTN_UPRIGHT">
- <pos>45,55d</pos> <size>24,24d</size>
+ <pos>45,55d</pos>
+ <size>16,16d</size>
+ <camartstyle>wxCACS_TOOLBACKGROUND|wxCACS_PUSHBUTTON|wxCACS_TOGGLEBUTTON</camartstyle>
<label>-</label>
</object>
<object class="wxCamArtControl" name="IDC_BTN_SIDEWAYS">
- <pos>69,55d</pos> <size>24,24d</size>
+ <pos>69,55d</pos>
+ <size>16,16d</size>
+ <camartstyle>wxCACS_TOOLBACKGROUND|wxCACS_PUSHBUTTON|wxCACS_TOGGLEBUTTON</camartstyle>
<label>-</label>
</object>
<object class="wxTextCtrl" name="IDC_SCALEEDIT">
@@ -27,6 +46,10 @@
<label>&Best fit</label>
<style>wxRB_GROUP</style>
</object>
+ <object class="wxRadioButton" name="IDC_BESTFITPAPER">
+ <pos>105,95d</pos> <size>95,10d</size>
+ <label>&Automatic fit</label>
+ </object>
<object class="wxRadioButton" name="IDC_CUSTOMFIT">
<pos>10,115d</pos> <size>45,10d</size>
<label>&Custom fit</label>
@@ -60,10 +83,6 @@
<pos>105,59d</pos> <size>20,8d</size>
<label>Scale:</label>
</object>
- <object class="wxStaticBox" name="IDC_STATIC">
- <pos>85,395d</pos> <size>25,0d</size>
- <label>tits 1</label>
- </object>
<object class="wxStaticText" name="IDC_LEFTTEXT">
<pos>72,132d</pos> <size>15,8d</size>
<label>Left:</label>
@@ -92,10 +111,6 @@
<pos>140,156d</pos> <size>23,8d</size>
<label>Gutter:</label>
</object>
- <object class="wxStaticBox" name="IDC_STATIC">
- <pos>145,390d</pos> <size>55,0d</size>
- <label>tits 2</label>
- </object>
<object class="wxStaticText" name="IDC_PRINT_DOCNAMETEXT">
<pos>5,5d</pos> <size>70,8d</size>
<label>Print layout options for</label>
@@ -124,11 +139,6 @@
<pos>50,38d</pos> <size>146,10d</size>
<label>210mm x 297mm</label>
</object>
- <object class="wxRadioButton" name="IDC_BESTFITPAPER">
- <pos>105,95d</pos> <size>95,10d</size>
- <label>&Automatic fit</label>
- <style>wxRB_GROUP</style>
- </object>
<title>Print layout</title>
<label>Print layout</label>
</object>
@@ -171,6 +181,11 @@
<object class="wxOwnerDrawnComboBox" name="IDC_FILLQUALLIST">
<pos>48,145d</pos> <size>48,-1d</size>
<style>wxCB_READONLY</style>
+ <content>
+ <item>High</item>
+ <item>Normal</item>
+ <item>Low</item>
+ </content>
</object>
<object class="wxStaticBox" name="IDC_GROUP_PRINTLAYERS">
<pos>5,19d</pos> <size>195,30d</size>
@@ -208,6 +223,10 @@
<pos>105,133d</pos> <size>95,30d</size>
<label>Text options</label>
</object>
+ <object class="wxCheckBox" name="IDC_ALLTEXTASSHAPES">
+ <pos>110,146d</pos> <size>85,12d</size>
+ <label>Print all text as shapes</label>
+ </object>
<title> Output </title>
<label> Output </label>
</object>
Index: Trunk/XaraLX/wxOil/xrc/IDD_OPTSTAB_PRINTGENERAL.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: Trunk/XaraLX/wxOil/xrc/IDD_OPTSTAB_PRINTGENERAL.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Index: Trunk/XaraLX/wxOil/xrc/IDD_OPTSTAB_PRINTLAYOUT.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: Trunk/XaraLX/wxOil/xrc/IDD_OPTSTAB_PRINTLAYOUT.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Xara