Commit e77f6f98 authored by Alexandre Lision's avatar Alexandre Lision Committed by Alexandre Lision

welcome view: update description

- Change Ring description
- Add background texture to the main screen

Tuleap: #1291
Change-Id: I0c6646ad8223045a7127a8aa3db2113d28ed4e21
parent 447ba3d2
......@@ -183,6 +183,8 @@ SET(ringclient_VIEWS
src/views/ContextualTableCellView.h
src/views/IconButton.h
src/views/IconButton.mm
src/views/BackgroundView.h
src/views/BackgroundView.mm
src/views/IMTableCellView.h
src/views/IMTableCellView.mm)
......@@ -236,6 +238,8 @@ SET_SOURCE_FILES_PROPERTIES(${myApp_ICON} PROPERTIES
SET(ring_ICONS
${CMAKE_CURRENT_SOURCE_DIR}/data/symbol_name.png
${CMAKE_CURRENT_SOURCE_DIR}/data/background-light.png
${CMAKE_CURRENT_SOURCE_DIR}/data/background-dark.png
${CMAKE_CURRENT_SOURCE_DIR}/data/symbol_blue.png
${CMAKE_CURRENT_SOURCE_DIR}/data/background_tile.png
${CMAKE_CURRENT_SOURCE_DIR}/data/dark/ic_more.png
......
......@@ -40,6 +40,7 @@
#import "PreferencesWC.h"
#import "views/IconButton.h"
#import "views/NSColor+RingTheme.h"
#import "views/BackgroundView.h"
@interface RingWindowController () <MigrateRingAccountsDelegate>
......@@ -58,6 +59,7 @@
__unsafe_unretained IBOutlet NSImageView* qrcodeView;
PreferencesWC* preferencesWC;
CurrentCallVC* currentCallVC;
ConversationVC* offlineVC;
}
......@@ -69,6 +71,8 @@ static NSString* const kPreferencesIdentifier = @"PreferencesIdentifier";
[super windowDidLoad];
[self.window setMovableByWindowBackground:YES];
[self.window setBackgroundColor:[NSColor colorWithRed:242.0/255 green:242.0/255 blue:242.0/255 alpha:1.0]];
currentCallVC = [[CurrentCallVC alloc] initWithNibName:@"CurrentCall" bundle:nil];
offlineVC = [[ConversationVC alloc] initWithNibName:@"Conversation" bundle:nil];
......
/*
* Copyright (C) 2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#import <Cocoa/Cocoa.h>
@interface BackgroundView : NSView
typedef NS_ENUM(NSUInteger, BackgroundTheme) {
Light,
Dark
};
/**
* Define which images will be used for drawing
*/
@property enum BackgroundTheme theme;
@end
/*
* Copyright (C) 2016 Savoir-faire Linux Inc.
* Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#import "BackgroundView.h"
@interface BackgroundView()
@property __strong NSImage* centerImage;
@end
@implementation BackgroundView
-(void) awakeFromNib
{
switch (self.theme) {
case Dark:
self.centerImage = [NSImage imageNamed:@"background-dark.png"];
break;
case Light:
default:
self.centerImage = [NSImage imageNamed:@"background-light.png"];
break;
}
}
- (void) drawRect:(NSRect)dirtyRect
{
NSDrawThreePartImage([self frame], nil, self.centerImage, nil, NO, NSCompositeSourceOver, 1.0, NO);
}
@end
......@@ -44,8 +44,8 @@
/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "d5o-nL-fRP"; */
"d5o-nL-fRP.placeholderString" = "Category";
/* Class = "NSTextFieldCell"; title = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user."; ObjectID = "eln-Vm-t0d"; */
"eln-Vm-t0d.title" = "Ring is a secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.";
/* Class = "NSTextFieldCell"; title = "Ring is free software for universal communication which respects the freedoms and privacy of its users."; ObjectID = "eln-Vm-t0d"; */
"eln-Vm-t0d.title" = "Ring is free software for universal communication which respects the freedoms and privacy of its users.";
/* Class = "NSTextFieldCell"; placeholderString = "Category"; ObjectID = "gaf-Za-tuc"; */
"gaf-Za-tuc.placeholderString" = "Category";
......
This diff is collapsed.
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