sc/AllLangResTarget_sc.mk | 1 sc/source/ui/collab/contacts.cxx | 12 +- sc/source/ui/collab/contacts.hrc | 2 sc/source/ui/collab/contacts.hxx | 39 +++++++ sc/source/ui/collab/contacts.src | 192 +-------------------------------------- 5 files changed, 51 insertions(+), 195 deletions(-)
New commits: commit 83ddef371e8977f55554be411968044b7b12bb81 Author: Michael Meeks <michael.me...@suse.com> Date: Fri Mar 23 17:07:38 2012 +0000 tubes: more work on contact list and missing files diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index ab87f3d..6f6067e 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -71,6 +71,7 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/attrdlg.src \ sc/source/ui/src/filter.src \ sc/source/ui/cctrl/checklistmenu.src \ + sc/source/ui/collab/contacts.src \ sc/source/ui/navipi/navipi.src \ sc/source/ui/docshell/tpstat.src \ sc/source/ui/pagedlg/pagedlg.src \ diff --git a/sc/source/ui/collab/contacts.cxx b/sc/source/ui/collab/contacts.cxx index ff3db98..d517888 100644 --- a/sc/source/ui/collab/contacts.cxx +++ b/sc/source/ui/collab/contacts.cxx @@ -38,21 +38,19 @@ #ifdef CONTACTS_DLG namespace { -class TubeContacts : SfxModelessDialog +class TubeContacts : ModelessDialog { + FixedLine maLabel; SvxSimpleTableContainer maListContainer; SvxSimpleTable maList; public: TubeContacts() : - SystemWindow( WINDOW_FLOATINGWINDOW, ), - maListContainer( this, CUI_RES( LB_JAVA ) ), + ModelessDialog( NULL, RID_SCDLG_CONTACTS ), + maLabel( this, ScResId( FL_LABEL ) ), + maListContainer( this, ScResId( CTL_LIST ) ), maList( maListContainer ), { -ScResId( FL_PRINTAREA ) ), - - ResId aResId; - mpListContainer = new SvxSimpleTableContainer( this, aResId ); SetMinOutputSizePixel( Size( 640, 480 ) ); Show(); } diff --git a/sc/source/ui/collab/contacts.hrc b/sc/source/ui/collab/contacts.hrc index 0ee1b06..c6e38d3 100644 --- a/sc/source/ui/collab/contacts.hrc +++ b/sc/source/ui/collab/contacts.hrc @@ -4,4 +4,4 @@ #define CTL_LIST 2 #define STR_HEADER_ALIAS 20 -#define STR_HEADER_FEATURES 21 +#define STR_HEADER_NAME 21 diff --git a/sc/source/ui/collab/contacts.hxx b/sc/source/ui/collab/contacts.hxx new file mode 100644 index 0000000..657df23 --- /dev/null +++ b/sc/source/ui/collab/contacts.hxx @@ -0,0 +1,39 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Michael Meeks <michael.me...@suse.com> (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include "sal/config.h" + +#include <vector> +#include "collab.hxx" +#include <tubes/conference.hxx> + +namespace tubes { + void createContacts(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/collab/contacts.src b/sc/source/ui/collab/contacts.src index ab20c87..0972920 100644 --- a/sc/source/ui/collab/contacts.src +++ b/sc/source/ui/collab/contacts.src @@ -1,13 +1,12 @@ #include "sc.hrc" #include "contacts.hrc" -#include <cuires.hrc> ModelessDialog RID_SCDLG_CONTACTS { HelpId = HID_SCPAGE_AREAS; // has to be something ... OutputSize = TRUE ; SVLook = TRUE ; - Hide = TRUE ; + Hide = FALSE ; Moveable = TRUE ; Closeable = TRUE ; Size = MAP_APPFONT ( 320 , 480 ) ; @@ -19,7 +18,7 @@ ModelessDialog RID_SCDLG_CONTACTS Size = MAP_APPFONT ( 400 , 8 ) ; Text [ en-US ] = "Here are your contacts" ; }; - Control LB_JAVA + Control CTL_LIST { Pos = MAP_APPFONT ( 21 , 38 ) ; Size = MAP_APPFONT ( 177 , 130 ) ; @@ -28,191 +27,10 @@ ModelessDialog RID_SCDLG_CONTACTS }; String STR_HEADER_ALIAS { - Text [ en-US ] = "Vendor" ; + Text [ en-US ] = "Alias" ; }; - String STR_HEADER_VERSION + String STR_HEADER_NAME { - Text [ en-US ] = "Version" ; + Text [ en-US ] = "Name" ; }; - String STR_HEADER_FEATURES - { - Text [ en-US ] = "Features" ; - }; -}; - -// RID_SVXDLG_JAVA_PARAMETER --------------------------------------------- - -ModalDialog RID_SVXDLG_JAVA_PARAMETER -{ - HelpId = HID_OPTIONS_JAVA_PARAMETER ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 270 , 140 ) ; - Text [ en-US ] = "Java Start Parameters" ; - Moveable = TRUE ; - FixedText FT_PARAMETER - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 202 , 8 ) ; - Text [ en-US ] = "Java start ~parameter" ; - }; - Edit ED_PARAMETER - { - HelpID = "cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER"; - Pos = MAP_APPFONT ( 6 , 15 ) ; - Size = MAP_APPFONT ( 202 , 12 ) ; - Border = TRUE ; - }; - PushButton PB_ASSIGN - { - HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN"; - Pos = MAP_APPFONT ( 214 , 14 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Assign" ; - }; - FixedText FT_ASSIGNED - { - Pos = MAP_APPFONT ( 6 , 31 ) ; - Size = MAP_APPFONT ( 202 , 8 ) ; - Text [ en-US ] = "Assig~ned start parameters" ; - }; - ListBox LB_ASSIGNED - { - HelpID = "cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED"; - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 42 ) ; - Size = MAP_APPFONT ( 202 , 53 ) ; - AutoHScroll = TRUE ; - }; - FixedText FT_EXAMPLE - { - Pos = MAP_APPFONT ( 6 , 98 ) ; - Size = MAP_APPFONT ( 202 , 8 ) ; - Text [ en-US ] = "For example: -Dmyprop=c:\\program files\\java" ; - }; - PushButton PB_REMOVE - { - HelpID = "cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE"; - Pos = MAP_APPFONT ( 214 , 42 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Remove" ; - }; - FixedLine FL_BUTTONS - { - Pos = MAP_APPFONT ( 3 , 109 ) ; - Size = MAP_APPFONT ( 264 , 8 ) ; - }; - OKButton PB_PARAMETER_OK - { - Pos = MAP_APPFONT ( 105 , 120 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - DefButton = TRUE ; - }; - CancelButton PB_PARAMETER_ESC - { - Pos = MAP_APPFONT ( 158 , 120 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; - HelpButton PB_PARAMETER_HLP - { - Pos = MAP_APPFONT ( 214 , 120 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; -}; - -// RID_SVXDLG_JAVA_CLASSPATH --------------------------------------------- - -ModalDialog RID_SVXDLG_JAVA_CLASSPATH -{ - HelpId = HID_OPTIONS_JAVA_CLASSPATH ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 240 , 120 ) ; - Text [ en-US ] = "Class Path" ; - Moveable = TRUE ; - FixedText FT_PATH - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 172 , 8 ) ; - Text [ en-US ] = "A~ssigned folders and archives" ; - }; - ListBox LB_PATH - { - HelpID = "cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH"; - Pos = MAP_APPFONT ( 6 , 14 ) ; - Size = MAP_APPFONT ( 172 , 72 ) ; - Border = TRUE ; - AutoHScroll = TRUE ; - }; - PushButton PB_ADDARCHIVE - { - HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE"; - Pos = MAP_APPFONT ( 184 , 14 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Add Archive..." ; - }; - PushButton PB_ADDPATH - { - HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH"; - Pos = MAP_APPFONT ( 184 , 31 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "Add ~Folder" ; - }; - PushButton PB_REMOVE_PATH - { - HelpID = "cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH"; - Pos = MAP_APPFONT ( 184 , 48 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - Text [ en-US ] = "~Remove" ; - }; - FixedLine FL_PATH_BUTTONS - { - Pos = MAP_APPFONT ( 3 , 89 ) ; - Size = MAP_APPFONT ( 236 , 8 ) ; - }; - OKButton PB_PATH_OK - { - Pos = MAP_APPFONT ( 75 , 100 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - DefButton = TRUE ; - }; - CancelButton PB_PATH_ESC - { - Pos = MAP_APPFONT ( 128 , 100 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; - HelpButton PB_PATH_HLP - { - Pos = MAP_APPFONT ( 186 , 100 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - }; -}; - -ErrorBox RID_SVXERR_JRE_NOT_RECOGNIZED -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The folder you selected does not contain a Java runtime environment.\nPlease select a different folder." ; -}; - -ErrorBox RID_SVXERR_JRE_FAILED_VERSION -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "The Java runtime environment you selected is not the required version.\nPlease select a different folder." ; -}; - -WarningBox RID_SVX_MSGBOX_JAVA_RESTART -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "For the selected Java runtime environment to work properly, %PRODUCTNAME must be restarted.\nPlease restart %PRODUCTNAME now." ; }; - -WarningBox RID_SVX_MSGBOX_JAVA_RESTART2 -{ - BUTTONS = WB_OK ; - DEFBUTTON = WB_DEF_OK ; - Message [ en-US ] = "You have to restart %PRODUCTNAME so the new or modified values can take effect.\nPlease restart %PRODUCTNAME now." ; -}; - _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits