Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
9fa72ccc
Kaydet (Commit)
9fa72ccc
authored
Ara 06, 2012
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert Printer Options dialog to .ui
Change-Id: Ie9f5823170c58f785328e41edcfa1ad70a949529
üst
f06ba360
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
97 additions
and
48 deletions
+97
-48
UI_sfx.mk
sfx2/UI_sfx.mk
+1
-0
prnmon.hxx
sfx2/inc/sfx2/prnmon.hxx
+0
-3
printer.cxx
sfx2/source/view/printer.cxx
+10
-40
view.hrc
sfx2/source/view/view.hrc
+1
-1
view.src
sfx2/source/view/view.src
+0
-4
printeroptionsdialog.ui
sfx2/uiconfig/ui/printeroptionsdialog.ui
+85
-0
No files found.
sfx2/UI_sfx.mk
Dosyayı görüntüle @
9fa72ccc
...
...
@@ -12,6 +12,7 @@ $(eval $(call gb_UI_UI,sfx))
$(eval $(call gb_UI_add_uifiles,sfx,\
sfx2/uiconfig/ui/checkin \
sfx2/uiconfig/ui/password \
sfx2/uiconfig/ui/printeroptionsdialog \
))
# vim: set noet sw=4 ts=4:
sfx2/inc/sfx2/prnmon.hxx
Dosyayı görüntüle @
9fa72ccc
...
...
@@ -35,9 +35,6 @@ struct SfxPrintOptDlg_Impl;
class
SfxPrintOptionsDialog
:
public
ModalDialog
{
private
:
OKButton
aOkBtn
;
CancelButton
aCancelBtn
;
HelpButton
aHelpBtn
;
SfxPrintOptDlg_Impl
*
pDlgImpl
;
SfxViewShell
*
pViewSh
;
SfxItemSet
*
pOptions
;
...
...
sfx2/source/view/printer.cxx
Dosyayı görüntüle @
9fa72ccc
...
...
@@ -198,25 +198,20 @@ void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions )
//--------------------------------------------------------------------
SfxPrintOptionsDialog
::
SfxPrintOptionsDialog
(
Window
*
pParent
,
SfxPrintOptionsDialog
::
SfxPrintOptionsDialog
(
Window
*
pParent
,
SfxViewShell
*
pViewShell
,
const
SfxItemSet
*
pSet
)
:
ModalDialog
(
pParent
,
WinBits
(
WB_STDMODAL
|
WB_3DLOOK
)
),
aOkBtn
(
this
),
aCancelBtn
(
this
),
aHelpBtn
(
this
),
pDlgImpl
(
new
SfxPrintOptDlg_Impl
),
pViewSh
(
pViewShell
),
pOptions
(
pSet
->
Clone
()
),
pPage
(
NULL
)
const
SfxItemSet
*
pSet
)
:
ModalDialog
(
pParent
,
"PrinterOptionsDialog"
,
"sfx/ui/printeroptionsdialog.ui"
)
,
pDlgImpl
(
new
SfxPrintOptDlg_Impl
)
,
pViewSh
(
pViewShell
)
,
pOptions
(
pSet
->
Clone
())
{
SetText
(
SfxResId
(
STR_PRINT_OPTIONS_TITLE
).
toString
()
);
VclContainer
*
pVBox
=
m_pUIBuilder
->
get
<
VclVBox
>
(
"dialog-vbox1"
);
// Insert TabPage
pPage
=
pViewSh
->
CreatePrintOptionsPage
(
this
,
*
pOptions
);
pPage
=
pViewSh
->
CreatePrintOptionsPage
(
pVBox
,
*
pOptions
);
DBG_ASSERT
(
pPage
,
"CreatePrintOptions != SFX_VIEW_HAS_PRINTOPTIONS"
);
if
(
pPage
)
{
...
...
@@ -224,31 +219,6 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog( Window *pParent,
SetHelpId
(
pPage
->
GetHelpId
()
);
pPage
->
Show
();
}
// Set dialog size
Size
a6Sz
=
LogicToPixel
(
Size
(
6
,
6
),
MAP_APPFONT
);
Size
aBtnSz
=
LogicToPixel
(
Size
(
50
,
14
),
MAP_APPFONT
);
Size
aOutSz
(
pPage
?
pPage
->
GetSizePixel
()
:
Size
()
);
aOutSz
.
Height
()
+=
6
;
long
nWidth
=
aBtnSz
.
Width
();
nWidth
+=
a6Sz
.
Width
();
aOutSz
.
Width
()
+=
nWidth
;
if
(
aOutSz
.
Height
()
<
90
)
// at least the height of the 3 buttons
aOutSz
.
Height
()
=
90
;
SetOutputSizePixel
(
aOutSz
);
// set position and size of the buttons
Point
aBtnPos
(
aOutSz
.
Width
()
-
aBtnSz
.
Width
()
-
a6Sz
.
Width
(),
a6Sz
.
Height
()
);
aOkBtn
.
SetPosSizePixel
(
aBtnPos
,
aBtnSz
);
aBtnPos
.
Y
()
+=
aBtnSz
.
Height
()
+
(
a6Sz
.
Height
()
/
2
);
aCancelBtn
.
SetPosSizePixel
(
aBtnPos
,
aBtnSz
);
aBtnPos
.
Y
()
+=
aBtnSz
.
Height
()
+
a6Sz
.
Height
();
aHelpBtn
.
SetPosSizePixel
(
aBtnPos
,
aBtnSz
);
aCancelBtn
.
Show
();
aOkBtn
.
Show
();
aHelpBtn
.
Show
();
}
//--------------------------------------------------------------------
...
...
@@ -294,7 +264,7 @@ void SfxPrintOptionsDialog::DisableHelp()
{
pDlgImpl
->
mbHelpDisabled
=
sal_True
;
aHelpBtn
.
Disable
();
get
<
HelpButton
>
(
"help"
)
->
Disable
();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/source/view/view.hrc
Dosyayı görüntüle @
9fa72ccc
...
...
@@ -27,7 +27,7 @@
#define STR_PRINT_OPTIONS (RID_SFX_VIEW_START+ 6)
#define STR_PRINT_OPTIONS_TITLE (RID_SFX_VIEW_START+ 7)
#define STR_ERROR_PRINTER_BUSY (RID_SFX_VIEW_START+ 8)
#define STR_NOSTARTPRINTER (RID_SFX_VIEW_START+ 9)
#define STR_PRINTING (RID_SFX_VIEW_START+10)
...
...
sfx2/source/view/view.src
Dosyayı görüntüle @
9fa72ccc
...
...
@@ -38,10 +38,6 @@ String STR_PRINT_OPTIONS
{
Text [ en-US ] = "Options..." ;
};
String STR_PRINT_OPTIONS_TITLE
{
Text [ en-US ] = "Printer Options" ;
};
String STR_ERROR_PRINTER_BUSY
{
Text [ en-US ] = "Printer busy" ;
...
...
sfx2/uiconfig/ui/printeroptionsdialog.ui
0 → 100644
Dosyayı görüntüle @
9fa72ccc
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object
class=
"GtkDialog"
id=
"PrinterOptionsDialog"
>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"border_width"
>
5
</property>
<property
name=
"title"
translatable=
"yes"
>
Printer Options
</property>
<property
name=
"type_hint"
>
dialog
</property>
<child
internal-child=
"vbox"
>
<object
class=
"GtkBox"
id=
"dialog-vbox1"
>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"orientation"
>
vertical
</property>
<property
name=
"spacing"
>
2
</property>
<child
internal-child=
"action_area"
>
<object
class=
"GtkButtonBox"
id=
"dialog-action_area1"
>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"layout_style"
>
end
</property>
<child>
<object
class=
"GtkButton"
id=
"ok"
>
<property
name=
"label"
>
gtk-ok
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
<property
name=
"receives_default"
>
True
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"use_stock"
>
True
</property>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
<property
name=
"fill"
>
True
</property>
<property
name=
"position"
>
0
</property>
</packing>
</child>
<child>
<object
class=
"GtkButton"
id=
"cancel"
>
<property
name=
"label"
>
gtk-cancel
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
<property
name=
"receives_default"
>
True
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"use_stock"
>
True
</property>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
<property
name=
"fill"
>
True
</property>
<property
name=
"position"
>
1
</property>
</packing>
</child>
<child>
<object
class=
"GtkButton"
id=
"help"
>
<property
name=
"label"
>
gtk-help
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
True
</property>
<property
name=
"receives_default"
>
True
</property>
<property
name=
"use_action_appearance"
>
False
</property>
<property
name=
"use_stock"
>
True
</property>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
<property
name=
"fill"
>
True
</property>
<property
name=
"position"
>
2
</property>
</packing>
</child>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
<property
name=
"fill"
>
True
</property>
<property
name=
"pack_type"
>
end
</property>
<property
name=
"position"
>
0
</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<action-widgets>
<action-widget
response=
"0"
>
ok
</action-widget>
<action-widget
response=
"0"
>
cancel
</action-widget>
<action-widget
response=
"0"
>
help
</action-widget>
</action-widgets>
</object>
</interface>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment