Skip to content

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

convert extension dialog to .ui 

Change-Id: I4d938be9e960f421398dd40bbcf1b3cadc643de1
üst c814fba4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 145 deletions
dbaccess/source/ext/macromigration/rangeprogressbar.hxx
Dosyayı görüntüle @ f88473c5
......@@ -20,7 +20,7 @@
#ifndef DBACCESS_RANGEPROGRESSBAR_HXX
#define DBACCESS_RANGEPROGRESSBAR_HXX
#include <svtools/prgsbar.hxx>
#include <vcl/prgsbar.hxx>
//........................................................................
namespace dbmm
......
desktop/Module_desktop.mk
Dosyayı görüntüle @ f88473c5
......@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
Library_sofficeapp \
Library_spl \
Package_intro \
UI_deployment \
Zip_brand \
Zip_brand_dev \
))
......
desktop/UI_deployment.mk 0 → 100644
Dosyayı görüntüle @ f88473c5
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_UI_UI,desktop))
$(eval $(call gb_UI_add_uifiles,desktop,\
desktop/uiconfig/ui/ExtensionManager \
))
# vim: set noet sw=4 ts=4:
desktop/source/deployment/gui/dp_gui.hrc
Dosyayı görüntüle @ f88473c5
......@@ -23,21 +23,14 @@
#include "helpid.hrc"
// Package Manager Dialog:
#define RID_DLG_EXTENSION_MANAGER RID_DEPLOYMENT_GUI_START
#define RID_DLG_UPDATE_REQUIRED (RID_DEPLOYMENT_GUI_START + 11)
#define RID_EM_BTN_CLOSE 10
#define RID_EM_BTN_HELP 11
#define RID_EM_BTN_ADD 12
#define RID_EM_BTN_CHECK_UPDATES 13
#define RID_EM_BTN_CANCEL 15
#define RID_EM_FT_TYPE_EXTENSIONS 16
#define RID_EM_CBX_BUNDLED 17
#define RID_EM_CBX_SHARED 18
#define RID_EM_CBX_USER 19
#define RID_EM_FT_GET_EXTENSIONS 20
#define RID_EM_FT_PROGRESS 21
#define RID_EM_FT_MSG 22
#define RID_EM_BTN_CHECK_UPDATES 12
#define RID_EM_BTN_CANCEL 13
#define RID_EM_FT_PROGRESS 14
#define RID_EM_FT_MSG 15
// local RIDs:
#define PB_LICENSE_DOWN 50
......
desktop/source/deployment/gui/dp_gui_dialog2.hxx
Dosyayı görüntüle @ f88473c5
......@@ -33,9 +33,9 @@
#include "vcl/button.hxx"
#include "vcl/fixed.hxx"
#include "vcl/fixedhyper.hxx"
#include "vcl/prgsbar.hxx"
#include "vcl/timer.hxx"
#include "svtools/prgsbar.hxx"
#include "svtools/svmedit.hxx"
#include "osl/conditn.hxx"
......@@ -108,20 +108,16 @@ class ExtMgrDialog : public ModelessDialog,
public DialogHelper
{
ExtBoxWithBtns_Impl *m_pExtensionBox;
PushButton m_aAddBtn;
PushButton m_aUpdateBtn;
OKButton m_aCloseBtn;
HelpButton m_aHelpBtn;
FixedLine m_aDivider;
FixedLine m_aDivider2;
FixedText m_aTypeOfExtTxt;
CheckBox m_aBundledCbx;
CheckBox m_aSharedCbx;
CheckBox m_aUserCbx;
FixedHyperlink m_aGetExtensions;
FixedText m_aProgressText;
ProgressBar m_aProgressBar;
CancelButton m_aCancelBtn;
PushButton *m_pAddBtn;
PushButton *m_pUpdateBtn;
PushButton *m_pCloseBtn;
CheckBox *m_pBundledCbx;
CheckBox *m_pSharedCbx;
CheckBox *m_pUserCbx;
FixedHyperlink *m_pGetExtensions;
FixedText *m_pProgressText;
ProgressBar *m_pProgressBar;
CancelButton *m_pCancelBtn;
const String m_sAddPackages;
String m_sProgressText;
String m_sLastFolderURL;
......@@ -144,6 +140,7 @@ class ExtMgrDialog : public ModelessDialog,
DECL_DLLPRIVATE_LINK( HandleAddBtn, void * );
DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * );
DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * );
DECL_DLLPRIVATE_LINK( HandleCloseBtn, void * );
DECL_DLLPRIVATE_LINK( HandleExtTypeCbx, void * );
DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
DECL_DLLPRIVATE_LINK(TimeOutHdl, void *);
......@@ -153,7 +150,6 @@ public:
ExtMgrDialog( Window * pParent, TheExtensionManager *pManager );
virtual ~ExtMgrDialog();
virtual void Resize();
virtual long Notify( NotifyEvent& rNEvt );
virtual sal_Bool Close();
......@@ -173,6 +169,8 @@ public:
bool updatePackage(const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
bool acceptLicense(const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage );
TheExtensionManager* getExtensionManager() const { return m_pManager; }
virtual void prepareChecking();
virtual void checkEntries();
......
desktop/source/deployment/gui/dp_gui_dialog2.src
Dosyayı görüntüle @ f88473c5
......@@ -28,102 +28,6 @@
#include "svtools/controldims.hrc"
#include "dp_gui.hrc"
ModelessDialog RID_DLG_EXTENSION_MANAGER
{
HelpId = HID_PACKAGE_MANAGER;
Text [ en-US ] = "Extension Manager";
Size = MAP_APPFONT( 300, 250 );
OutputSize = TRUE;
SVLook = TRUE;
Moveable = TRUE;
Closeable = TRUE;
Sizeable = TRUE;
Hide = TRUE;
FixedText RID_EM_FT_TYPE_EXTENSIONS
{
NoLabel = FALSE;
TabStop = TRUE;
Text [ en-US ] = "Type of Extension";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT );
};
CheckBox RID_EM_CBX_BUNDLED
{
HelpID = "desktop:CheckBox:RID_DLG_EXTENSION_MANAGER:RID_EM_CBX_BUNDLED";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
TabStop = TRUE ;
Text [ en-US ] = "~Installation" ;
};
CheckBox RID_EM_CBX_SHARED
{
HelpID = "desktop:CheckBox:RID_DLG_EXTENSION_MANAGER:RID_EM_CBX_SHARED";
TabStop = TRUE ;
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Shared" ;
};
CheckBox RID_EM_CBX_USER
{
HelpID = "desktop:CheckBox:RID_DLG_EXTENSION_MANAGER:RID_EM_CBX_USER";
TabStop = TRUE ;
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~User" ;
};
PushButton RID_EM_BTN_ADD
{
HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_ADD";
TabStop = TRUE;
Text [ en-US ] = "~Add...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
PushButton RID_EM_BTN_CHECK_UPDATES
{
HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_CHECK_UPDATES";
TabStop = TRUE;
Text [ en-US ] = "~Check for Updates...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
FixedText RID_EM_FT_GET_EXTENSIONS
{
NoLabel = TRUE;
TabStop = TRUE;
Text [ en-US ] = "Get more extensions online...";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
};
FixedText RID_EM_FT_PROGRESS
{
Hide = TRUE;
Right = TRUE;
Text [ en-US ] = "Adding %EXTENSION_NAME";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
};
CancelButton RID_EM_BTN_CANCEL
{
TabStop = TRUE;
Hide = TRUE;
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
OKButton RID_EM_BTN_CLOSE
{
TabStop = TRUE;
DefButton = TRUE;
Text [ en-US ] = "Close";
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
HelpButton RID_EM_BTN_HELP
{
TabStop = TRUE;
Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
};
ModalDialog RID_DLG_UPDATE_REQUIRED
{
HelpId = HID_PACKAGE_MANAGER_UPD_REQ;
......
desktop/source/deployment/gui/dp_gui_extlistbox.cxx
Dosyayı görüntüle @ f88473c5
......@@ -168,7 +168,7 @@ ExtensionRemovedListener::~ExtensionRemovedListener()
//------------------------------------------------------------------------------
// ExtensionBox_Impl
//------------------------------------------------------------------------------
ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager ) :
ExtensionBox_Impl::ExtensionBox_Impl( Window* pParent, TheExtensionManager *pManager ) :
IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
m_bHasScrollBar( false ),
m_bHasActive( false ),
......@@ -186,6 +186,33 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan
m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
m_pScrollBar( NULL ),
m_pManager( pManager )
{
Init();
}
ExtensionBox_Impl::ExtensionBox_Impl(Window* pParent) :
IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
m_bHasScrollBar( false ),
m_bHasActive( false ),
m_bNeedsRecalc( true ),
m_bInCheckMode( false ),
m_bAdjustActive( false ),
m_bInDelete( false ),
m_nActive( 0 ),
m_nTopIndex( 0 ),
m_nActiveHeight( 0 ),
m_nExtraHeight( 2 ),
m_aSharedImage( DialogHelper::getResId( RID_IMG_SHARED ) ),
m_aLockedImage( DialogHelper::getResId( RID_IMG_LOCKED ) ),
m_aWarningImage( DialogHelper::getResId( RID_IMG_WARNING ) ),
m_aDefaultImage( DialogHelper::getResId( RID_IMG_EXTENSION ) ),
m_pScrollBar( NULL ),
m_pManager( NULL )
{
Init();
}
void ExtensionBox_Impl::Init()
{
SetHelpId( HID_EXTENSION_MANAGER_LISTBOX );
......
desktop/source/deployment/gui/dp_gui_extlistbox.hxx
Dosyayı görüntüle @ f88473c5
......@@ -178,8 +178,10 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
void checkIndex(sal_Int32 pos) const;
void Init();
public:
ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pManager );
ExtensionBox_Impl(Window* pParent);
ExtensionBox_Impl(Window* pParent, TheExtensionManager *pManager);
~ExtensionBox_Impl();
virtual void MouseButtonDown( const MouseEvent& rMEvt );
......@@ -211,6 +213,7 @@ public:
void checkEntries();
TheExtensionManager* getExtensionManager() const { return m_pManager; }
void setExtensionManager(TheExtensionManager* pManager) { m_pManager = pManager; }
//===================================================================================
//These functions are used for automatic testing
......
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
Dosyayı görüntüle @ f88473c5
......@@ -24,7 +24,7 @@
#include "vcl/button.hxx"
#include "vcl/fixed.hxx"
#include "vcl/dialog.hxx"
#include "svtools/prgsbar.hxx"
#include "vcl/prgsbar.hxx"
#include "rtl/ref.hxx"
#include <vector>
......
desktop/source/inc/helpid.hrc
Dosyayı görüntüle @ f88473c5
......@@ -19,7 +19,6 @@
#ifndef INCLUDED_DESKTOP_HELPID_HRC
#define INCLUDED_DESKTOP_HELPID_HRC
#define HID_PACKAGE_MANAGER "DESKTOP_HID_PACKAGE_MANAGER"
#define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX"
#define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS"
#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL"
......
desktop/uiconfig/ui/ExtensionManager.ui 0 → 100644
Dosyayı görüntüle @ f88473c5
This diff is collapsed.
desktop/util/hidother.src
Dosyayı görüntüle @ f88473c5
......@@ -18,7 +18,6 @@
#include "../source/inc/helpid.hrc"
hidspecial HID_PACKAGE_MANAGER { HelpID = HID_PACKAGE_MANAGER; };
hidspecial HID_PACKAGE_MANAGER_MENU_ITEM { HelpID = HID_PACKAGE_MANAGER_MENU_ITEM; };
hidspecial HID_PACKAGE_MANAGER_TREELISTBOX { HelpID = HID_PACKAGE_MANAGER_TREELISTBOX; };
hidspecial HID_PACKAGE_MANAGER_PROGRESS { HelpID = HID_PACKAGE_MANAGER_PROGRESS; };
......
padmin/source/progress.hxx
Dosyayı görüntüle @ f88473c5
......@@ -23,8 +23,7 @@
#include "vcl/dialog.hxx"
#include "vcl/fixed.hxx"
#include "vcl/button.hxx"
#include "svtools/prgsbar.hxx"
#include "vcl/prgsbar.hxx"
namespace padmin {
......
sd/source/ui/inc/BreakDlg.hxx
Dosyayı görüntüle @ f88473c5
......@@ -34,7 +34,7 @@
#include <svx/dlgctrl.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <svtools/prgsbar.hxx>
#include <vcl/prgsbar.hxx>
#include <vcl/edit.hxx>
#include <svtools/stdctrl.hxx>
#include <sfx2/basedlgs.hxx>
......
sd/source/ui/inc/vectdlg.hxx
Dosyayı görüntüle @ f88473c5
......@@ -36,8 +36,8 @@
#include <vcl/field.hxx>
#include <vcl/dialog.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/prgsbar.hxx>
#include <svx/graphctl.hxx>
#include <svtools/prgsbar.hxx>
namespace sd {
class DrawDocShell;
......
svtools/Library_svt.mk
Dosyayı görüntüle @ f88473c5
......@@ -119,7 +119,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/hyperlabel \
svtools/source/control/indexentryres \
svtools/source/control/inettbc \
svtools/source/control/prgsbar \
svtools/source/control/roadmap \
svtools/source/control/ruler \
svtools/source/control/scriptedtext \
......
svtools/Package_inc.mk
Dosyayı görüntüle @ f88473c5
......@@ -115,7 +115,6 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/place.hxx,svtools/plac
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/PlaceEditDialog.hxx,svtools/PlaceEditDialog.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupmenucontrollerbase.hxx,svtools/popupmenucontrollerbase.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/popupwindowcontroller.hxx,svtools/popupwindowcontroller.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prgsbar.hxx,svtools/prgsbar.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/printoptions.hxx,svtools/printoptions.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/prnsetup.hxx,svtools/prnsetup.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/roadmap.hxx,svtools/roadmap.hxx))
......
svtools/source/uno/unoiface.cxx
Dosyayı görüntüle @ f88473c5
......@@ -29,6 +29,7 @@
#include <tools/debug.hxx>
#include <vcl/fixedhyper.hxx>
#include <vcl/prgsbar.hxx>
#include <vcl/svapp.hxx>
#include <svtools/svmedit.hxx>
#include <unoiface.hxx>
......@@ -43,7 +44,6 @@
#include <svtools/fmtfield.hxx>
#include <svl/numuno.hxx>
#include <svtools/calendar.hxx>
#include <svtools/prgsbar.hxx>
#include <svtools/treelistbox.hxx>
#include "treecontrolpeer.hxx"
#include "svtxgridcontrol.hxx"
......
sw/source/ui/dbui/mmoutputpage.hxx
Dosyayı görüntüle @ f88473c5
......@@ -33,11 +33,11 @@
#include <vcl/combobox.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/prgsbar.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/basedlgs.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <svtools/prgsbar.hxx>
#include "swdllapi.h"
#include "mailmergehelper.hxx"
......
vcl/Library_vcl.mk
Dosyayı görüntüle @ f88473c5
......@@ -140,6 +140,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/control/menubtn \
vcl/source/control/morebtn \
vcl/source/control/quickselectionengine \
vcl/source/control/prgsbar \
vcl/source/control/scrbar \
vcl/source/control/slider \
vcl/source/control/spinbtn \
......
vcl/Package_inc.mk
Dosyayı görüntüle @ f88473c5
......@@ -106,6 +106,7 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngwrite.hxx,vcl/pngwrite.hxx)
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pointr.hxx,vcl/pointr.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/popupmenuwindow.hxx,vcl/popupmenuwindow.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ppdparser.hxx,vcl/ppdparser.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/prgsbar.hxx,vcl/prgsbar.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/printerinfomanager.hxx,vcl/printerinfomanager.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/print.hxx,vcl/print.hxx))
$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/prntypes.hxx,vcl/prntypes.hxx))
......
svtools/inc/svtools/prgsbar.hxx → vcl/inc/vcl/prgsbar.hxx
Dosyayı görüntüle @ f88473c5
......@@ -20,7 +20,7 @@
#ifndef _PRGSBAR_HXX
#define _PRGSBAR_HXX
#include "svtools/svtdllapi.h"
#include <vcl/dllapi.h>
#include <vcl/window.hxx>
/*************************************************************************
......@@ -58,7 +58,7 @@ groesser 100 gesetzt werden, faengt das letzte Rechteck an zu blinken.
// - ProgressBar -
// ---------------
class SVT_DLLPUBLIC ProgressBar : public Window
class VCL_DLLPUBLIC ProgressBar : public Window
{
private:
Point maPos;
......@@ -68,12 +68,10 @@ private:
sal_uInt16 mnPercentCount;
sal_Bool mbCalcNew;
#ifdef _SV_PRGSBAR_CXX
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit();
SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
SVT_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc );
#endif
SAL_DLLPRIVATE void ImplInit();
SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
SAL_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc );
public:
ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR );
......
svtools/source/control/prgsbar.cxx → vcl/source/control/prgsbar.cxx
Dosyayı görüntüle @ f88473c5
......@@ -22,7 +22,7 @@
#include <tools/debug.hxx>
#include <vcl/status.hxx>
#include <svtools/prgsbar.hxx>
#include <vcl/prgsbar.hxx>
// =======================================================================
......
vcl/source/window/builder.cxx
Dosyayı görüntüle @ f88473c5
......@@ -20,6 +20,7 @@
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/menubtn.hxx>
#include <vcl/prgsbar.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <vcl/tabctrl.hxx>
......@@ -765,6 +766,15 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
else
pWindow = new ScrollBar(pParent, WB_HORZ);
}
else if (name == "GtkProgressBar")
{
extractScrollAdjustment(id, rMap);
bVertical = extractOrientation(rMap);
if (bVertical)
pWindow = new ProgressBar(pParent, WB_VERT);
else
pWindow = new ProgressBar(pParent, WB_HORZ);
}
else if (name == "GtkScrolledWindow")
{
pWindow = new VclScrolledWindow(pParent);
......
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