loveisgrief/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac OSX Launcher: Storyboard and NIB updates. Also moved to resources which they belong.

Browse Source
This commit is contained in:
meeh
2019-05-02 22:48:16 +00:00
parent 84419bbf0b
commit 3e10745717
4 changed files with 22 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
launchers/macosx/I2PLauncher/Preferences.storyboard → launchers/macosx/I2PLauncher/Resources/Preferences.storyboard
View File

12
launchers/macosx/I2PLauncher/Resources/RouterServices.plist Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>services</key>
<array>
<string>I2PRouterService</string>
<string>HttpTunnelService</string>
<string>IrcTunnelService</string>
</array>
</dict>
</plist>

20
launchers/macosx/I2PLauncher/Storyboard.storyboard → launchers/macosx/I2PLauncher/Resources/Storyboard.storyboard
View File

@@ -10,21 +10,21 @@
<scene sceneID="4eF-i8-6L0">
<objects>
<viewController identifier="PopoverView" storyboardIdentifier="PopoverView" id="Ii7-Rb-Ls8" userLabel="PopoverController" customClass="PopoverViewController" customModule="I2PLauncher" customModuleProvider="target" sceneMemberID="viewController">
<tabView key="view" allowsTruncatedLabels="NO" initialItem="Fle-u6-lgB" id="dmf-Go-6qY">
<rect key="frame" x="0.0" y="0.0" width="450" height="300"/>
<tabView key="view" drawsBackground="NO" allowsTruncatedLabels="NO" initialItem="Fle-u6-lgB" id="dmf-Go-6qY">
<rect key="frame" x="0.0" y="0.0" width="450" height="333"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<font key="font" metaFont="system"/>
<tabViewItems>
<tabViewItem label="Router Status &amp; Control" identifier="" id="Fle-u6-lgB">
<view key="view" identifier="routerStatusTabView" canDrawConcurrently="YES" id="xXg-Bt-RWR" customClass="RouterStatusView" customModule="I2PLauncher" customModuleProvider="target">
<rect key="frame" x="10" y="33" width="430" height="254"/>
<rect key="frame" x="10" y="33" width="430" height="287"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<box fixedFrame="YES" title="Router information and status" translatesAutoresizingMaskIntoConstraints="NO" id="e8C-qI-SCp">
<rect key="frame" x="6" y="16" width="279" height="231"/>
<box fixedFrame="YES" boxType="secondary" title="Router information and status" translatesAutoresizingMaskIntoConstraints="NO" id="e8C-qI-SCp">
<rect key="frame" x="3" y="49" width="285" height="231"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<view key="contentView" id="zBB-wE-VXr">
<rect key="frame" x="3" y="3" width="273" height="213"/>
<rect key="frame" x="3" y="3" width="279" height="213"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField identifier="RouterStatusLabel" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0Eo-re-5WK" userLabel="RouterStatusLabel">
@@ -76,7 +76,7 @@
</view>
</box>
<box fixedFrame="YES" title="Quick Control" translatesAutoresizingMaskIntoConstraints="NO" id="IIP-Qi-7dp">
<rect key="frame" x="287" y="16" width="150" height="231"/>
<rect key="frame" x="287" y="49" width="150" height="231"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<view key="contentView" identifier="QuickControlView" id="D8V-d8-0wT">
<rect key="frame" x="3" y="3" width="144" height="213"/>
@@ -137,7 +137,7 @@
</tabViewItem>
<tabViewItem label="Router Log Viewer" identifier="" id="IFq-CR-cjD" customClass="LogViewerViewController" customModule="I2PLauncher" customModuleProvider="target">
<view key="view" id="7U9-d7-IVr">
<rect key="frame" x="10" y="33" width="430" height="254"/>
<rect key="frame" x="10" y="33" width="430" height="287"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView identifier="LoggerTextScrollView" fixedFrame="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jca-Kn-cO2" userLabel="LoggerTextScrollView">
@@ -145,7 +145,7 @@
<autoresizingMask key="autoresizingMask"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="E5l-WA-qOn">
<rect key="frame" x="1" y="1" width="407" height="226"/>
<autoresizingMask key="autoresizingMask"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView identifier="LoggerTextView" ambiguous="YES" importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="bgQ-8i-Xgb" userLabel="LoggerTextView">
<rect key="frame" x="0.0" y="0.0" width="407" height="226"/>
@@ -182,7 +182,7 @@
</viewController>
<customObject id="d8g-wS-Zts" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-823" y="166"/>
<point key="canvasLocation" x="-823" y="165.5"/>
</scene>
</scenes>
</document>

88
launchers/macosx/I2PLauncher/logger_c.h
View File

@@ -1,88 +0,0 @@
//
// logger_c.h
// I2PLauncher
//
// Created by Mikal Villa on 30/09/2018.
// Copyright © 2018 The I2P Project. All rights reserved.
//
#ifndef logger_c_h
#define logger_c_h
#include "Logger.h"
#include "LoggerWorker.hpp"
/*
void genericLogger(int loglevel, va_list params) {
#ifdef __cplusplus
const char * paramArray[10];
int numParams = 0;
NSString* arg = nil;
while ((arg = va_arg(params, NSString *))) {
paramArray[numParams++] = [arg cStringUsingEncoding:[NSString defaultCStringEncoding]];
}
switch (loglevel) {
case 0:
MLOGF(ANNOYING) << params;
break;
case 1:
MLOGF(DEBUG) << params;
break;
case 2:
MLOGF(INFO) << params;
break;
case 3:
MLOGF(WARN) << params;
break;
default:
assert(false);
}
#endif
}
*/
inline void MLog(int loglevel, NSString* format, ...)
{
#ifdef __cplusplus
va_list vargs;
va_start(vargs, format);
NSString* formattedMessage = [[NSString alloc] initWithFormat:format arguments:vargs];
va_end(vargs);
NSString* message = formattedMessage;
switch (loglevel) {
case 0:
MLOG(ANNOYING) << [message UTF8String];
break;
case 1:
MLOG(DEBUG) << [message UTF8String];
break;
case 2:
MLOG(INFO) << [message UTF8String];
break;
case 3:
MLOG(WARN) << [message UTF8String];
break;
case 4:
MLOG(ERROR) << [message UTF8String];
break;
default:
#if DEBUG
assert(false);
#else
return;
#endif
}
#endif
}
#define MMLog(format_string,...) ((MLog(1, [NSString stringWithFormat:format_string,##__VA_ARGS__])))
#endif /* logger_c_h */