summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-08-25 13:19:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-08-25 16:45:24 +0100
commitb6d25be2d7ab81fb5343b742542b79bad2121024 (patch)
tree9d208005ebf5249eedf49f149a1010b3323cc362
parent70724fc7e0c41a555e6a56ca42f36280e5f81c4c (diff)
convert RID_QRYBOX_LANGUAGE with custom title to .ui
Change-Id: I007820c7717a437414bc43936e3138f7e63d090e
-rw-r--r--basctl/AllLangResTarget_basctl.mk1
-rw-r--r--basctl/UIConfig_basicide.mk1
-rw-r--r--basctl/source/dlged/dlgresid.src5
-rw-r--r--basctl/source/dlged/managelang.cxx6
-rw-r--r--basctl/source/dlged/managelang.src30
-rw-r--r--basctl/source/inc/dlgresid.hrc7
-rw-r--r--basctl/uiconfig/basicide/ui/deletelangdialog.ui36
7 files changed, 40 insertions, 46 deletions
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index d20fc6e2ab4b..66f8b5aa3831 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -45,7 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,basctl/res,\
basctl/source/basicide/moduldlg.src \
basctl/source/basicide/objdlg.src \
basctl/source/dlged/dlgresid.src \
- basctl/source/dlged/managelang.src \
))
# vim: set noet sw=4 ts=4:
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index 567bb0c6f3f6..e556374d35d8 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/defaultlanguage \
+ basctl/uiconfig/basicide/ui/deletelangdialog \
basctl/uiconfig/basicide/ui/dialogpage \
basctl/uiconfig/basicide/ui/exportdialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src
index 6aa952d6037d..c4c6601ddc27 100644
--- a/basctl/source/dlged/dlgresid.src
+++ b/basctl/source/dlged/dlgresid.src
@@ -134,11 +134,6 @@ String RID_STR_DEF_LANG
Text [ en-US ] = "[Default Language]" ;
};
-String RID_STR_DELETE
-{
- Text [ en-US ] = "~Delete" ;
-};
-
String RID_STR_CREATE_LANG
{
Text [ en-US ] = "<Press 'Add' to create language resources>" ;
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 175e464d3227..5751fe4c24ba 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -36,7 +36,7 @@
#include <svx/langbox.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
namespace basctl
@@ -59,7 +59,6 @@ ManageLanguageDialog::ManageLanguageDialog(Window* pParent, boost::shared_ptr<Lo
: ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui")
, m_xLocalizationMgr(xLMgr)
, m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG))
- , m_sDeleteStr(IDE_RESSTR(RID_STR_DELETE))
, m_sCreateLangStr(IDE_RESSTR(RID_STR_CREATE_LANG))
{
get(m_pLanguageLB, "treeview");
@@ -155,8 +154,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl)
IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl)
{
- QueryBox aQBox( this, IDEResId( RID_QRYBOX_LANGUAGE ) );
- aQBox.SetButtonText( RET_OK, m_sDeleteStr );
+ MessageDialog aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelang.ui");
if ( aQBox.Execute() == RET_OK )
{
sal_uInt16 i, nCount = m_pLanguageLB->GetSelectEntryCount();
diff --git a/basctl/source/dlged/managelang.src b/basctl/source/dlged/managelang.src
deleted file mode 100644
index 7a6a6ceef19c..000000000000
--- a/basctl/source/dlged/managelang.src
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- 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 "dlgresid.hrc"
-
-QueryBox RID_QRYBOX_LANGUAGE
-{
- Title [ en-US ] = "Delete Language Resources" ;
- Message [ en-US ] = "You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted.\n\nDo you want to delete the resources of the selected language(s)?";
- BUTTONS = WB_OK_CANCEL ;
- DEFBUTTON = WB_DEF_CANCEL ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index 54d6ca12d508..a6b1fc9829ef 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -50,8 +50,7 @@
#define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 )
#define RID_STR_CLASS_SPINCONTROL ( RID_DLG_START + 24 )
#define RID_STR_DEF_LANG ( RID_DLG_START + 25 )
-#define RID_STR_DELETE ( RID_DLG_START + 26 )
-#define RID_STR_CREATE_LANG ( RID_DLG_START + 27 )
+#define RID_STR_CREATE_LANG ( RID_DLG_START + 26 )
// Property Browser Headline Id's -----------------------------------------------------------
@@ -59,10 +58,6 @@
#define RID_STR_BRWTITLE_NO_PROPERTIES ( RID_DLG_START + 61 )
#define RID_STR_BRWTITLE_MULTISELECT ( RID_DLG_START + 62 )
-// Manage Language Dialogs
-
-#define RID_QRYBOX_LANGUAGE ( RID_DLG_START + 70 )
-
#endif // BASCTL_DLGRESID_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/uiconfig/basicide/ui/deletelangdialog.ui b/basctl/uiconfig/basicide/ui/deletelangdialog.ui
new file mode 100644
index 000000000000..f23e50fe9715
--- /dev/null
+++ b/basctl/uiconfig/basicide/ui/deletelangdialog.ui
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMessageDialog" id="DeleteLangDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Delete Language Resources</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="message_type">question</property>
+ <property name="buttons">ok-cancel</property>
+ <property name="text" translatable="yes">Do you want to delete the resources of the selected language(s)</property>
+ <property name="secondary_text" translatable="yes">You are about to delete the resources for the selected language(s). All user interface strings for this language(s) will be deleted.</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="messagedialog-vbox">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">24</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="messagedialog-action_area">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ </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>
+ </object>
+ </child>
+ </object>
+</interface>