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
dc5e8921
Kaydet (Commit)
dc5e8921
authored
Eyl 02, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert SID_RECORDING_FLOATWINDOW to .ui
Change-Id: Iae3f0269e5e7f830465580dc4a520ba01ef87a79
üst
b6cc10ec
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
77 additions
and
47 deletions
+77
-47
basedlgs.hxx
include/sfx2/basedlgs.hxx
+2
-1
floatwin.hxx
include/vcl/floatwin.hxx
+2
-1
syswin.hxx
include/vcl/syswin.hxx
+1
-1
UIConfig_sfx.mk
sfx2/UIConfig_sfx.mk
+1
-0
basedlgs.cxx
sfx2/source/dialog/basedlgs.cxx
+2
-2
recfloat.cxx
sfx2/source/dialog/recfloat.cxx
+10
-13
recfloat.src
sfx2/source/dialog/recfloat.src
+0
-24
recfloat.hxx
sfx2/source/inc/recfloat.hxx
+1
-1
floatingrecord.ui
sfx2/uiconfig/ui/floatingrecord.ui
+53
-0
floatwin.cxx
vcl/source/window/floatwin.cxx
+2
-2
syswin.cxx
vcl/source/window/syswin.cxx
+3
-2
No files found.
include/sfx2/basedlgs.hxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -141,7 +141,8 @@ protected:
SfxFloatingWindow
(
SfxBindings
*
pBindings
,
SfxChildWindow
*
pCW
,
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
);
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
&
rFrame
=
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
());
virtual
~
SfxFloatingWindow
();
virtual
void
StateChanged
(
StateChangedType
nStateChange
)
SAL_OVERRIDE
;
...
...
include/vcl/floatwin.hxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -121,7 +121,8 @@ public:
public
:
explicit
FloatingWindow
(
Window
*
pParent
,
WinBits
nStyle
=
WB_STDFLOATWIN
);
explicit
FloatingWindow
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
);
explicit
FloatingWindow
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
&
rFrame
=
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
());
explicit
FloatingWindow
(
Window
*
pParent
,
const
ResId
&
);
virtual
~
FloatingWindow
();
...
...
include/vcl/syswin.hxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -170,7 +170,7 @@ private:
protected
:
// Single argument ctors shall be explicit.
explicit
SystemWindow
(
WindowType
nType
);
void
loadUI
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
);
void
loadUI
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
&
rFrame
=
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
()
);
void
SetWindowStateData
(
const
WindowStateData
&
rData
);
...
...
sfx2/UIConfig_sfx.mk
Dosyayı görüntüle @
dc5e8921
...
...
@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/documentpropertiesdialog \
sfx2/uiconfig/ui/editdurationdialog \
sfx2/uiconfig/ui/errorfindemaildialog \
sfx2/uiconfig/ui/floatingrecord \
sfx2/uiconfig/ui/helpbookmarkpage \
sfx2/uiconfig/ui/helpcontrol \
sfx2/uiconfig/ui/helpcontentpage \
...
...
sfx2/source/dialog/basedlgs.cxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -483,8 +483,8 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
SfxFloatingWindow
::
SfxFloatingWindow
(
SfxBindings
*
pBindinx
,
SfxChildWindow
*
pCW
,
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
)
:
FloatingWindow
(
pParent
,
rID
,
rUIXMLDescription
),
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
&
rFrame
)
:
FloatingWindow
(
pParent
,
rID
,
rUIXMLDescription
,
rFrame
),
pBindings
(
pBindinx
),
pImp
(
new
SfxFloatingWindow_Impl
)
{
...
...
sfx2/source/dialog/recfloat.cxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -167,25 +167,22 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
:
SfxFloatingWindow
(
pBind
,
pChildWin
,
pParent
,
SfxResId
(
SID_RECORDING_FLOATWINDOW
)
)
,
aTbx
(
this
,
SfxResId
(
SID_RECORDING_FLOATWINDOW
)
)
"FloatingRecord"
,
"sfx/ui/floatingrecord.ui"
,
pBind
->
GetActiveFrame
()
)
{
get
(
m_pTbx
,
"toolbar"
);
// Retrieve label from helper function
uno
::
Reference
<
frame
::
XFrame
>
xFrame
=
GetBindings
().
GetActive
Frame
();
uno
::
Reference
<
frame
::
XFrame
>
xFrame
=
get
Frame
();
OUString
aCommandStr
(
".uno:StopRecording"
);
aTbx
.
SetItemText
(
SID_STOP_RECORDING
,
GetLabelFromCommandURL
(
aCommandStr
,
xFrame
));
// Determine size of toolbar
Size
aTbxSize
=
aTbx
.
CalcWindowSizePixel
();
aTbx
.
SetPosSizePixel
(
Point
(),
aTbxSize
);
SetOutputSizePixel
(
aTbxSize
);
sal_uInt16
nItemId
=
m_pTbx
->
GetItemId
(
aCommandStr
);
m_pTbx
->
SetItemText
(
nItemId
,
GetLabelFromCommandURL
(
aCommandStr
,
xFrame
));
// create a generic toolbox controller for our internal toolbox
svt
::
GenericToolboxController
*
pController
=
new
svt
::
GenericToolboxController
(
::
comphelper
::
getProcessComponentContext
(),
xFrame
,
&
a
Tbx
,
SID_STOP_RECORDING
,
m_p
Tbx
,
nItemId
,
aCommandStr
);
xStopRecTbxCtrl
=
uno
::
Reference
<
frame
::
XToolbarController
>
(
static_cast
<
cppu
::
OWeakObject
*
>
(
pController
),
...
...
@@ -194,7 +191,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
if
(
xUpdate
.
is
()
)
xUpdate
->
update
();
aTbx
.
SetSelectHdl
(
LINK
(
this
,
SfxRecordingFloat_Impl
,
Select
)
);
m_pTbx
->
SetSelectHdl
(
LINK
(
this
,
SfxRecordingFloat_Impl
,
Select
)
);
// start recording
SfxBoolItem
aItem
(
SID_RECORDMACRO
,
true
);
...
...
@@ -248,7 +245,7 @@ void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange )
IMPL_LINK
(
SfxRecordingFloat_Impl
,
Select
,
ToolBox
*
,
pToolBar
)
{
(
void
)
pToolBar
;
sal_Int16
nKeyModifier
(
(
sal_Int16
)
aTbx
.
GetModifier
()
);
sal_Int16
nKeyModifier
(
(
sal_Int16
)
m_pTbx
->
GetModifier
()
);
if
(
xStopRecTbxCtrl
.
is
()
)
xStopRecTbxCtrl
->
execute
(
nKeyModifier
);
...
...
sfx2/source/dialog/recfloat.src
Dosyayı görüntüle @
dc5e8921
...
...
@@ -22,30 +22,6 @@
#define STD_MASKCOLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
FloatingWindow SID_RECORDING_FLOATWINDOW
{
HelpID = "sfx2:FloatingWindow:SID_RECORDING_FLOATWINDOW";
Moveable = TRUE ;
Closeable = TRUE ;
Hide = TRUE ;
SVLook = TRUE ;
Text [ en-US ] = "Record Macro";
};
ToolBox SID_RECORDING_FLOATWINDOW
{
SVLook = TRUE ;
ButtonType = BUTTON_TEXT;
ItemList =
{
ToolBoxItem
{
Identifier = SID_STOP_RECORDING;
Command = ".uno:StopRecording";
};
};
};
String STR_MACRO_LOSS
{
Text [ en-US ] = "Do you really want to cancel the recording? Any steps recorded up to this point will be lost.";
...
...
sfx2/source/inc/recfloat.hxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -39,7 +39,7 @@ public:
class
SfxRecordingFloat_Impl
:
public
SfxFloatingWindow
{
ToolBox
a
Tbx
;
ToolBox
*
m_p
Tbx
;
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
frame
::
XToolbarController
>
xStopRecTbxCtrl
;
public
:
SfxRecordingFloat_Impl
(
SfxBindings
*
pBindings
,
...
...
sfx2/uiconfig/ui/floatingrecord.ui
0 → 100644
Dosyayı görüntüle @
dc5e8921
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires
lib=
"gtk+"
version=
"3.0"
/>
<object
class=
"GtkWindow"
id=
"FloatingRecord"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"no_show_all"
>
True
</property>
<property
name=
"border_width"
>
6
</property>
<property
name=
"title"
translatable=
"yes"
>
Record Macro
</property>
<property
name=
"type_hint"
>
utility
</property>
<property
name=
"deletable"
>
False
</property>
<child>
<object
class=
"GtkBox"
id=
"box1"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"hexpand"
>
True
</property>
<property
name=
"vexpand"
>
True
</property>
<property
name=
"orientation"
>
vertical
</property>
<child>
<object
class=
"GtkToolbar"
id=
"toolbar"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"hexpand"
>
True
</property>
<property
name=
"vexpand"
>
True
</property>
<property
name=
"toolbar_style"
>
text
</property>
<property
name=
"show_arrow"
>
False
</property>
<child>
<object
class=
"GtkToolButton"
id=
"stop"
>
<property
name=
"visible"
>
True
</property>
<property
name=
"can_focus"
>
False
</property>
<property
name=
"hexpand"
>
True
</property>
<property
name=
"vexpand"
>
True
</property>
<property
name=
"action_name"
>
.uno:StopRecording
</property>
<property
name=
"label"
translatable=
"yes"
>
Stop Recording
</property>
<property
name=
"use_underline"
>
True
</property>
</object>
<packing>
<property
name=
"expand"
>
True
</property>
<property
name=
"homogeneous"
>
True
</property>
</packing>
</child>
</object>
<packing>
<property
name=
"expand"
>
False
</property>
<property
name=
"fill"
>
True
</property>
<property
name=
"position"
>
0
</property>
</packing>
</child>
</object>
</child>
</object>
</interface>
vcl/source/window/floatwin.cxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -164,10 +164,10 @@ FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) :
Show
();
}
FloatingWindow
::
FloatingWindow
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
)
FloatingWindow
::
FloatingWindow
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
&
rFrame
)
:
SystemWindow
(
WINDOW_FLOATINGWINDOW
)
{
loadUI
(
pParent
,
rID
,
rUIXMLDescription
);
loadUI
(
pParent
,
rID
,
rUIXMLDescription
,
rFrame
);
}
//Find the real parent stashed in mpDialogParent.
...
...
vcl/source/window/syswin.cxx
Dosyayı görüntüle @
dc5e8921
...
...
@@ -95,11 +95,12 @@ SystemWindow::SystemWindow(WindowType nType)
Init
();
}
void
SystemWindow
::
loadUI
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
)
void
SystemWindow
::
loadUI
(
Window
*
pParent
,
const
OString
&
rID
,
const
OUString
&
rUIXMLDescription
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
&
rFrame
)
{
mbIsDefferedInit
=
true
;
mpDialogParent
=
pParent
;
//should be unset in doDeferredInit
m_pUIBuilder
=
new
VclBuilder
(
this
,
getUIRootDir
(),
rUIXMLDescription
,
rID
);
m_pUIBuilder
=
new
VclBuilder
(
this
,
getUIRootDir
(),
rUIXMLDescription
,
rID
,
rFrame
);
}
SystemWindow
::~
SystemWindow
()
...
...
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