Skip to content

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

convert user admin dialog to .ui 

Change-Id: Iee1a8b5f1fac024fb5983063f032b344e5814fbc
üst 8cfebe96
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 83 deletions
dbaccess/AllLangResTarget_dbu.mk
Dosyayı görüntüle @ 2bf00a57
......@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/RelationDlg.src \
dbaccess/source/ui/dlg/sqlmessage.src \
dbaccess/source/ui/dlg/textconnectionsettings.src \
dbaccess/source/ui/dlg/UserAdminDlg.src \
dbaccess/source/ui/dlg/UserAdmin.src \
dbaccess/source/ui/misc/dbumiscres.src \
dbaccess/source/ui/misc/WizardPages.src \
......
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ 2bf00a57
......@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/sortdialog \
dbaccess/uiconfig/ui/tablesfilterdialog \
dbaccess/uiconfig/ui/tablesfilterpage \
dbaccess/uiconfig/ui/useradmindialog \
))
# vim: set noet sw=4 ts=4:
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ 2bf00a57
......@@ -295,7 +295,6 @@
#define HID_APP_VIEW_PREVIEW_3 "DBACCESS_HID_APP_VIEW_PREVIEW_3"
#define HID_DSADMIN_TYPE_DIALOG "DBACCESS_HID_DSADMIN_TYPE_DIALOG"
#define HID_DSADMIN_USERADMIN "DBACCESS_HID_DSADMIN_USERADMIN"
#define HID_DBWIZ_PREVIOUS "DBACCESS_HID_DBWIZ_PREVIOUS"
#define HID_DBWIZ_NEXT "DBACCESS_HID_DBWIZ_NEXT"
......
dbaccess/source/ui/dlg/UserAdminDlg.cxx
Dosyayı görüntüle @ 2bf00a57
......@@ -25,7 +25,6 @@
#include "propertysetitem.hxx"
#include "UITools.hxx"
#include "UserAdmin.hxx"
#include "UserAdminDlg.hrc"
#include "UserAdminDlg.hxx"
#include <comphelper/processfactory.hxx>
......@@ -52,12 +51,11 @@ namespace dbaui
,const Reference< XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
,const Reference< XConnection >& _xConnection)
:SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_USERADMIN), _pItems)
,m_pItemSet(_pItems)
,m_xConnection(_xConnection)
,m_bOwnConnection(!_xConnection.is())
: SfxTabDialog(_pParent, "UserAdminDialog", "dbaccess/ui/useradmindialog.ui", _pItems)
, m_pItemSet(_pItems)
, m_xConnection(_xConnection)
, m_bOwnConnection(!_xConnection.is())
{
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
......@@ -67,11 +65,10 @@ namespace dbaui
delete pExampleSet;
pExampleSet = new SfxItemSet(*GetInputSetImpl());
AddTabPage(TAB_PAGE_USERADMIN, OUString(ModuleRes(STR_PAGETITLE_USERADMIN)), OUserAdmin::Create,0, sal_False, 1);
AddTabPage("settings", OUserAdmin::Create, 0);
// remove the reset button - it's meaning is much too ambiguous in this dialog
RemoveResetButton();
FreeResource();
}
OUserAdminDlg::~OUserAdminDlg()
......
dbaccess/source/ui/dlg/UserAdminDlg.hrc deleted 100644 → 0
Dosyayı görüntüle @ 8cfebe96
/* -*- 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 .
*/
#ifndef DBAUI_USERADMINDLG_HRC
#define DBAUI_USERADMINDLG_HRC
#define STR_PAGETITLE_USERADMIN 1
#endif // DBAUI_USERADMINDLG_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/UserAdminDlg.src deleted 100644 → 0
Dosyayı görüntüle @ 8cfebe96
/* -*- 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 "dbaccess_helpid.hrc"
#include "UserAdminDlg.hrc"
#include "dbu_dlg.hrc"
TabDialog DLG_DATABASE_USERADMIN
{
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
Hide = TRUE;
HelpId = HID_DSADMIN_USERADMIN;
TabControl 1
{
OutputSize = TRUE ;
};
String STR_PAGETITLE_USERADMIN
{
Text[ en-US ] = "User Settings";
};
Text [ en-US ] = "User administration" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/inc/dbu_resource.hrc
Dosyayı görüntüle @ 2bf00a57
......@@ -90,7 +90,7 @@
// FREE
#define DLG_INDEXDESIGN RID_DIALOG_START + 19
// FREE
#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21
// FREE
// FREE
#define DLG_PASSWORD RID_DIALOG_START + 23
#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
......
dbaccess/uiconfig/ui/useradmindialog.ui 0 → 100644
Dosyayı görüntüle @ 2bf00a57
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Wed Jan 29 14:36:32 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="UserAdminDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">User administration</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">12</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="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</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="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</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="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</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>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="settings">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes">User Settings</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</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>
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