Skip to content

C
core
Kaydet (Commit) 91ffdf58 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert picture frame to .ui 

Change-Id: I624a4cfa8a5e8c3c72833ff0c3545deadbe4435d
üst d3ffe3ed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 224 deletions
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 91ffdf58
......@@ -469,6 +469,10 @@
generic-name="TabWin_Impl" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="BmpWindow" name="swuilo-BmpWindow"
generic-name="BmpWindow" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Recent Documents View" name="sfxlo-RecentDocsView"
generic-name="Icon View" parent="GtkIconView"
icon-name="widget-gtk-iconview"/>
......
sw/AllLangResTarget_sw.mk
Dosyayı görüntüle @ 91ffdf58
......@@ -102,7 +102,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/envelp/labfmt.src \
sw/source/ui/envelp/mailmrge.src \
sw/source/ui/fldui/fldui.src \
sw/source/ui/frmdlg/frmpage.src \
sw/source/ui/frmdlg/frmui.src \
sw/source/ui/globdoc/globdoc.src \
sw/source/ui/index/cnttab.src \
......
sw/UIConfig_swriter.mk
Dosyayı görüntüle @ 91ffdf58
......@@ -148,6 +148,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/queryshowchangesdialog \
sw/uiconfig/swriter/ui/paradialog \
sw/uiconfig/swriter/ui/picturedialog \
sw/uiconfig/swriter/ui/picturepage \
sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printeroptions \
sw/uiconfig/swriter/ui/printmonitordialog \
......
sw/inc/globals.hrc
Dosyayı görüntüle @ 91ffdf58
......@@ -127,8 +127,6 @@
#define TP_OPTTEST_PAGE (RC_GLOBALS_BEGIN + 25)
#define TP_OPTPRINT_PAGE (RC_GLOBALS_BEGIN + 26)
#define TP_GRF_EXT (RC_GLOBALS_BEGIN + 35)
#define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45)
#define TP_STD_FONT (RC_GLOBALS_BEGIN + 47)
#define TP_CONDCOLL (RC_GLOBALS_BEGIN + 48)
......
sw/inc/helpid.h
Dosyayı görüntüle @ 91ffdf58
......@@ -136,7 +136,6 @@
// TabPage Help-IDs
#define HID_GRF_EXT "SW_HID_GRF_EXT"
#define HID_COND_COLL "SW_HID_COND_COLL"
#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL"
......
sw/source/ui/frmdlg/frmpage.cxx
Dosyayı görüntüle @ 91ffdf58
This diff is collapsed.
sw/source/ui/frmdlg/frmpage.hrc deleted 100644 → 0
Dosyayı görüntüle @ d3ffe3ed
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svtools/controldims.hrc>
// metrics
#define SWFRMPG_COL_0 RSC_SP_TBPG_INNERBORDER_LEFT
#define SWFRMPG_COL_1 (SWFRMPG_COL_0+RSC_SP_FLGR_INNERBORDER_LEFT)
#define SWFRMPG_COL_2 (SWFRMPG_COL_1+RSC_SP_FLGR_INNERBORDER_LEFT)
#define SWFRMPG_COL_3 76
#define SWFRMPG_COL_4 109
#define SWFRMPG_ROW_CONDENSE 1
#define SWFRMPG_ROW_0 RSC_SP_TBPG_INNERBORDER_TOP
#define SWFRMPG_ROW_1 (SWFRMPG_ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP-SWFRMPG_ROW_CONDENSE)
#define SWFRMPG_ROW_2 (SWFRMPG_ROW_1+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
#define SWFRMPG_ROW_3 (SWFRMPG_ROW_1+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
#define SWFRMPG_ROW_4 (SWFRMPG_ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
#define SWFRMPG_ROW_5 (SWFRMPG_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
#define SWFRMPG_ROW_6 (SWFRMPG_ROW_5+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
#define SWFRMPG_ROW_7 (SWFRMPG_ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
#define SWFRMPG_ROW_8 (SWFRMPG_ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y-SWFRMPG_ROW_CONDENSE)
#define SWFRMPG_ROW_9 (SWFRMPG_ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
#define SWFRMPG_ROW_10 (SWFRMPG_ROW_9+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y-SWFRMPG_ROW_CONDENSE)
#define SWFRMPG_ROW_11 (SWFRMPG_ROW_10+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_INNERBORDER_TOP)
#define SWFRMPG_ROW_12 (SWFRMPG_ROW_11+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
#define SWFRMPG_ROW_13 (SWFRMPG_ROW_11+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
#define SWFRMPG_ROW_14 (SWFRMPG_ROW_13+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
#define SWFRMPG_ROW_15 (SWFRMPG_ROW_14+((RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2))
#define SWFRMPG_ROW_16 (SWFRMPG_ROW_14+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
#define CB_HOR 46
#define CB_VERT 47
#define FL_MIRROR 51
#define WN_BMP 52
#define PB_BROWSE 53
#define ED_CONNECT 54
#define FL_CONNECT 55
#define FT_CONNECT 57
#define BMP_EXAMPLE 62
#define RB_MIRROR_ALL_PAGES 64
#define RB_MIRROR_LEFT_PAGES 65
#define RB_MIRROR_RIGHT_PAGES 66
#define CB_REL_WIDTH 100
#define CB_REL_HEIGHT 101
#define CB_FIXEDRATIO 102
#define CB_ANCHOR_ONLY 103
#define FT_NAME 110
#define ED_NAME 111
#define FL_TYPE_SEP 126
#define CB_FOLLOWTEXTFLOW 129
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/frmdlg/frmpage.src deleted 100644 → 0
Dosyayı görüntüle @ d3ffe3ed
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "frmui.hrc"
#include "frmpage.hrc"
#include "globals.hrc"
#include "helpid.h"
#include "svx/dialogs.hrc"
TabPage TP_GRF_EXT
{
Hide = TRUE ;
HelpID = HID_GRF_EXT ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Bitmap BMP_EXAMPLE
{
File = "image-example.bmp" ;
};
FixedLine FL_CONNECT
{
Pos = MAP_APPFONT ( 6 , 87 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Link" ;
};
FixedText FT_CONNECT
{
Pos = MAP_APPFONT ( 13 , 98 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
Text [ en-US ] = "~File name" ;
};
Edit ED_CONNECT
{
HelpID = "sw:Edit:TP_GRF_EXT:ED_CONNECT";
Pos = MAP_APPFONT ( 13 , 109 ) ;
Size = MAP_APPFONT ( 200 , 12 ) ;
Text [ en-US ] = "[None]" ;
Readonly = TRUE ;
Left = TRUE ;
Border = TRUE ;
};
PushButton PB_BROWSE
{
HelpID = "sw:PushButton:TP_GRF_EXT:PB_BROWSE";
Disable = TRUE ;
Pos = MAP_APPFONT ( 230 , 109 ) ;
Size = MAP_APPFONT ( 12 , 12 ) ;
Disable = TRUE ;
TabStop = TRUE ;
Text [ en-US ] = "~..." ;
};
CheckBox CB_VERT
{
HelpID = "sw:CheckBox:TP_GRF_EXT:CB_VERT";
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 48 , 10 ) ;
TabStop = TRUE ;
Group = TRUE ;
Text [ en-US ] = "~Vertically" ;
};
CheckBox CB_HOR
{
HelpID = "sw:CheckBox:TP_GRF_EXT:CB_HOR";
Pos = MAP_APPFONT ( 12 , 28 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Hori~zontally";
};
RadioButton RB_MIRROR_ALL_PAGES
{
HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_ALL_PAGES";
Pos = MAP_APPFONT ( 18 , 42 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "On all pages" ;
};
RadioButton RB_MIRROR_LEFT_PAGES
{
HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_LEFT_PAGES";
Pos = MAP_APPFONT ( 18 , 56 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "On left pages" ;
};
RadioButton RB_MIRROR_RIGHT_PAGES
{
HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_RIGHT_PAGES";
Pos = MAP_APPFONT ( 18 , 70 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "On right pages" ;
};
Window WN_BMP
{
Pos = MAP_APPFONT ( 120 , 14 ) ;
Size = MAP_APPFONT ( 127 , 66 ) ;
};
FixedLine FL_MIRROR
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
Text [ en-US ] = "Flip" ;
};
};
String STR_EDIT_GRF
{
Text [ en-US ] = "Link" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/source/ui/inc/bmpwin.hxx
Dosyayı görüntüle @ 91ffdf58
......@@ -38,18 +38,17 @@ private:
sal_Bool bGraphic : 1;
bool bLeftAlign : 1;
void Paint(const Rectangle& rRect);
virtual void Paint(const Rectangle& rRect);
virtual Size GetOptimalSize() const;
public:
BmpWindow(Window* pPar, sal_uInt16 nId,
const Graphic& rGraphic, const BitmapEx& rBmp);
BmpWindow(Window* pParent, const ResId rResId) :
Window(pParent, rResId),
bHorz(sal_False), bVert(sal_False),bGraphic(sal_False), bLeftAlign(true) {}
BmpWindow(Window* pPar, WinBits nStyle);
~BmpWindow();
void MirrorVert(sal_Bool bMirror) { bVert = bMirror; Invalidate(); }
void MirrorHorz(sal_Bool bMirror) { bHorz = bMirror; Invalidate(); }
void SetGraphic(const Graphic& rGrf);
void SetBitmapEx(const BitmapEx& rGrf);
};
#endif
......
sw/source/ui/inc/frmpage.hxx
Dosyayı görüntüle @ 91ffdf58
......@@ -202,18 +202,16 @@ public:
class SwGrfExtPage: public SfxTabPage
{
// mirror
FixedLine aMirrorFL;
CheckBox aMirrorVertBox;
CheckBox aMirrorHorzBox;
RadioButton aAllPagesRB;
RadioButton aLeftPagesRB;
RadioButton aRightPagesRB;
BmpWindow aBmpWin;
FixedLine aConnectFL;
FixedText aConnectFT;
Edit aConnectED;
PushButton aBrowseBT;
VclContainer* m_pMirror;
CheckBox* m_pMirrorVertBox;
CheckBox* m_pMirrorHorzBox;
RadioButton* m_pAllPagesRB;
RadioButton* m_pLeftPagesRB;
RadioButton* m_pRightPagesRB;
BmpWindow* m_pBmpWin;
Edit* m_pConnectED;
PushButton* m_pBrowseBT;
String aFilterName;
String aGrfName, aNewGrfName;
......
sw/source/ui/inc/frmui.hrc
Dosyayı görüntüle @ 91ffdf58
......@@ -51,8 +51,6 @@
#define STR_OLE_EDIT (STR_FRMDLG_BEGIN + 46)
#define STR_COLL_HEADER (STR_FRMDLG_BEGIN + 47)
#define STR_EDIT_GRF (STR_FRMDLG_BEGIN + 49)
#define STR_LINE_TOP (STR_FRMDLG_BEGIN + 50)
#define STR_LINE_BOTTOM (STR_FRMDLG_BEGIN + 51)
#define STR_LINE_CENTER (STR_FRMDLG_BEGIN + 52)
......
sw/uiconfig/swriter/ui/picturepage.ui 0 → 100644
Dosyayı görüntüle @ 91ffdf58
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment