about.cxx (2ee96f1c) | about.cxx (a392ac37) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 217 unchanged lines hidden (view full) --- 226 Font aSmallFont = rSettings.GetInfoFont(); 227 Size aSmaller = aNewFont.GetSize(); 228 aSmaller.Width() = (long) (aSmaller.Width() * 0.75); 229 aSmaller.Height() = (long) (aSmaller.Height() * 0.75); 230 aNewFont.SetSize( aSmaller ); 231 aBuildData.SetFont( aNewFont ); 232 aBuildData.SetBackground( aWall ); 233#ifdef BUILD_VER_STRING | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 217 unchanged lines hidden (view full) --- 226 Font aSmallFont = rSettings.GetInfoFont(); 227 Size aSmaller = aNewFont.GetSize(); 228 aSmaller.Width() = (long) (aSmaller.Width() * 0.75); 229 aSmaller.Height() = (long) (aSmaller.Height() * 0.75); 230 aNewFont.SetSize( aSmaller ); 231 aBuildData.SetFont( aNewFont ); 232 aBuildData.SetBackground( aWall ); 233#ifdef BUILD_VER_STRING |
234 String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) ); | 234#define _STRINGIFY(x) #x 235#define STRINGIFY(x) _STRINGIFY(x) 236 String aBuildString( DEFINE_CONST_UNICODE( STRINGIFY( BUILD_VER_STRING ) ) ); |
235#else 236 String aBuildString; 237#endif 238 aBuildData.SetText( aBuildString ); 239 aBuildData.Show(); 240 241 // determine size and position of the dialog & elements 242 Size aAppLogoSiz = aAppLogo.GetSizePixel(); 243 Size aOutSiz = GetOutputSizePixel(); 244 aOutSiz.Width() = aAppLogoSiz.Width(); 245 246 Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); 247 long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 ); 248 long nDlgMargin = a6Size.Width() * 4 ; 249 long nCtrlMargin = a6Size.Height() * 2; 250 long nTextWidth = aOutSiz.Width() - nDlgMargin; 251 252 aCopyrightText.SetText( aCopyrightTextStr ); | 237#else 238 String aBuildString; 239#endif 240 aBuildData.SetText( aBuildString ); 241 aBuildData.Show(); 242 243 // determine size and position of the dialog & elements 244 Size aAppLogoSiz = aAppLogo.GetSizePixel(); 245 Size aOutSiz = GetOutputSizePixel(); 246 aOutSiz.Width() = aAppLogoSiz.Width(); 247 248 Size a6Size = aVersionText.LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); 249 long nY = aAppLogoSiz.Height() + ( a6Size.Height() * 2 ); 250 long nDlgMargin = a6Size.Width() * 4 ; 251 long nCtrlMargin = a6Size.Height() * 2; 252 long nTextWidth = aOutSiz.Width() - nDlgMargin; 253 254 aCopyrightText.SetText( aCopyrightTextStr ); |
253 | 255 256 // layout fixed text controls |
254 layoutText( aVersionText, nY, nTextWidth, a6Size ); | 257 layoutText( aVersionText, nY, nTextWidth, a6Size ); |
255 nY += nCtrlMargin; 256 | 258 if( aBuildString.Len() > 0 ) 259 { 260 nY += ( a6Size.Height() / 2 ); 261 layoutText( aBuildData, nY, nTextWidth, a6Size ); 262 } 263 nY += nCtrlMargin; 264 |
257 // OK-Button-Position (at the bottom and centered) 258 Size aOKSiz = aOKButton.GetSizePixel(); 259 Point aOKPnt = aOKButton.GetPosPixel(); 260 261 // Multiline edit with Copyright-Text 262 Point aCopyPnt = aCopyrightText.GetPosPixel(); 263 Size aCopySize = aCopyrightText.GetSizePixel(); 264 aCopySize.Width() = nTextWidth; --- 156 unchanged lines hidden --- | 265 // OK-Button-Position (at the bottom and centered) 266 Size aOKSiz = aOKButton.GetSizePixel(); 267 Point aOKPnt = aOKButton.GetPosPixel(); 268 269 // Multiline edit with Copyright-Text 270 Point aCopyPnt = aCopyrightText.GetPosPixel(); 271 Size aCopySize = aCopyrightText.GetSizePixel(); 272 aCopySize.Width() = nTextWidth; --- 156 unchanged lines hidden --- |