Skip to content

Commit

Permalink
Rename code & text
Browse files Browse the repository at this point in the history
  • Loading branch information
jjw24 committed Apr 21, 2020
1 parent 98758f6 commit 1b79530
Show file tree
Hide file tree
Showing 321 changed files with 1,100 additions and 1,100 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ paket-files/
# New to Visual Studio
*.VC.db

## Wox specific
## Flow.Launcher specific
Output/*
/Python.Runtime.dll
Thumbs.db
Expand Down
Binary file modified Doc/app.psd
Binary file not shown.
Binary file modified Doc/app_error.psd
Binary file not shown.
16 changes: 8 additions & 8 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
Known problems for 1.3.183:
We are aware of the following issues and the following workarounds exist:
1. `System.NullReferenceException`: https://github.com/Wox-launcher/Wox/releases/tag/v1.3.475
1. `System.NullReferenceException`: https://github.com/Flow.Launcher-launcher/Flow.Launcher/releases/tag/v1.3.475
2. `System.UriFormatException`: delete your old theme file
3. `System.Threading.Tasks.TaskCanceledException`: https://github.com/Wox-launcher/Wox/releases/tag/v1.3.475
4. `System.AggregateException`: see https://github.com/Wox-launcher/Wox/issues/1777
3. `System.Threading.Tasks.TaskCanceledException`: https://github.com/Flow.Launcher-launcher/Flow.Launcher/releases/tag/v1.3.475
4. `System.AggregateException`: see https://github.com/Flow.Launcher-launcher/Flow.Launcher/issues/1777
If none of them match your case, please continue.
Expand All @@ -63,11 +63,11 @@
2.
3.

### Wox Error Window text
### Flow.Launcher Error Window text
<!--
Paste below the logs generated by the Wox error reporter.
Paste below the logs generated by the Flow.Launcher error reporter.
请在此处粘贴 Wox 错误报告程序提供的日志。
请在此处粘贴 Flow.Launcher 错误报告程序提供的日志。
-->

(paste here)
Expand All @@ -76,14 +76,14 @@
### Detailed logs
<!--
Please also provide detailed logs. The latest log file
can be found here: %APPDATA%\Wox\Logs\version\<date>.txt
can be found here: %APPDATA%\Flow.Launcher\Logs\version\<date>.txt
Drag and drop that file below this comment.
In some cases you can skip uploading the the logs, but the chances
of us being able to solve the problem will be higher if you do.
详细日志:
请在此处提供详细日志。你可以在这个目录找到最新的日志:
%APPDATA%\Wox\Logs\version\<date>.txt
%APPDATA%\Flow.Launcher\Logs\version\<date>.txt
直接拖放文件到这个评论就可以上传(国内大部分地区可能需要翻墙才能上传,作为备选方案可以考虑直接在此粘贴文件内容)
-->

Expand Down
26 changes: 13 additions & 13 deletions JsonRPC/wox.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import sys
import inspect

class Wox(object):
class Flow.Launcher(object):
"""
Wox python plugin base
Flow.Launcher python plugin base
"""

def __init__(self):
Expand Down Expand Up @@ -42,74 +42,74 @@ def debug(self,msg):
print("DEBUG:{}".format(msg))
sys.exit()

class WoxAPI(object):
class Flow.LauncherAPI(object):

@classmethod
def change_query(cls,query,requery = False):
"""
change wox query
"""
print(json.dumps({"method": "Wox.ChangeQuery","parameters":[query,requery]}))
print(json.dumps({"method": "Flow.Launcher.ChangeQuery","parameters":[query,requery]}))

@classmethod
def shell_run(cls,cmd):
"""
run shell commands
"""
print(json.dumps({"method": "Wox.ShellRun","parameters":[cmd]}))
print(json.dumps({"method": "Flow.Launcher.ShellRun","parameters":[cmd]}))

@classmethod
def close_app(cls):
"""
close wox
"""
print(json.dumps({"method": "Wox.CloseApp","parameters":[]}))
print(json.dumps({"method": "Flow.Launcher.CloseApp","parameters":[]}))

@classmethod
def hide_app(cls):
"""
hide wox
"""
print(json.dumps({"method": "Wox.HideApp","parameters":[]}))
print(json.dumps({"method": "Flow.Launcher.HideApp","parameters":[]}))

@classmethod
def show_app(cls):
"""
show wox
"""
print(json.dumps({"method": "Wox.ShowApp","parameters":[]}))
print(json.dumps({"method": "Flow.Launcher.ShowApp","parameters":[]}))

@classmethod
def show_msg(cls,title,sub_title,ico_path=""):
"""
show messagebox
"""
print(json.dumps({"method": "Wox.ShowMsg","parameters":[title,sub_title,ico_path]}))
print(json.dumps({"method": "Flow.Launcher.ShowMsg","parameters":[title,sub_title,ico_path]}))

@classmethod
def open_setting_dialog(cls):
"""
open setting dialog
"""
print(json.dumps({"method": "Wox.OpenSettingDialog","parameters":[]}))
print(json.dumps({"method": "Flow.Launcher.OpenSettingDialog","parameters":[]}))

@classmethod
def start_loadingbar(cls):
"""
start loading animation in wox
"""
print(json.dumps({"method": "Wox.StartLoadingBar","parameters":[]}))
print(json.dumps({"method": "Flow.Launcher.StartLoadingBar","parameters":[]}))

@classmethod
def stop_loadingbar(cls):
"""
stop loading animation in wox
"""
print(json.dumps({"method": "Wox.StopLoadingBar","parameters":[]}))
print(json.dumps({"method": "Flow.Launcher.StopLoadingBar","parameters":[]}))

@classmethod
def reload_plugins(cls):
"""
reload all wox plugins
"""
print(json.dumps({"method": "Wox.ReloadPlugins","parameters":[]}))
print(json.dumps({"method": "Flow.Launcher.ReloadPlugins","parameters":[]}))
2 changes: 1 addition & 1 deletion Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
<ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Plugins/HelloWorldCSharp/Main.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Wox.Plugin;
using Flow.Launcher.Plugin;

namespace HelloWorldCSharp
{
Expand Down
2 changes: 1 addition & 1 deletion Plugins/HelloWorldCSharp/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Author":"happlebao",
"Version":"1.0.0",
"Language":"csharp",
"Website":"https://github.com/Wox-launcher/Wox",
"Website":"https://github.com/Flow.Launcher-launcher/Flow.Launcher",
"ExecuteFileName":"HelloWorldCSharp.dll",
"IcoPath":"app.png",
"Disabled": true
Expand Down
4 changes: 2 additions & 2 deletions Plugins/HelloWorldPython/main.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-

from wox import Wox
from wox import Flow.Launcher

class HelloWorld(Wox):
class HelloWorld(Flow.Launcher):

def query(self, query):
results = []
Expand Down
2 changes: 1 addition & 1 deletion Plugins/HelloWorldPython/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"Author":"happlebao",
"Version":"1.0",
"Language":"python",
"Website":"https://github.com/Wox-launcher/Wox",
"Website":"https://github.com/Flow.Launcher-launcher/Flow.Launcher",
"IcoPath":"Images\\app.png",
"ExecuteFileName":"main.py"
}
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.BrowserBookmark/Bookmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Text;


namespace Wox.Plugin.BrowserBookmark
namespace Flow.Launcher.Plugin.BrowserBookmark
{
public class Bookmark : IEquatable<Bookmark>, IEqualityComparer<Bookmark>
{
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.BrowserBookmark/ChromeBookmarks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Linq;
using System.Text.RegularExpressions;

namespace Wox.Plugin.BrowserBookmark
namespace Flow.Launcher.Plugin.BrowserBookmark
{
public class ChromeBookmarks
{
Expand Down
4 changes: 2 additions & 2 deletions Plugins/Wox.Plugin.BrowserBookmark/Commands/Bookmarks.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Collections.Generic;
using System.Linq;
using Wox.Infrastructure;
using Flow.Launcher.Infrastructure;

namespace Wox.Plugin.BrowserBookmark.Commands
namespace Flow.Launcher.Plugin.BrowserBookmark.Commands
{
internal static class Bookmarks
{
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.BrowserBookmark/FirefoxBookmarks.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.IO;
using System.Linq;

namespace Wox.Plugin.BrowserBookmark
namespace Flow.Launcher.Plugin.BrowserBookmark
{
public class FirefoxBookmarks
{
Expand Down
12 changes: 6 additions & 6 deletions Plugins/Wox.Plugin.BrowserBookmark/Main.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System.Collections.Generic;
using System.Linq;
using System.Windows.Controls;
using Wox.Infrastructure.Storage;
using Wox.Plugin.BrowserBookmark.Commands;
using Wox.Plugin.BrowserBookmark.Models;
using Wox.Plugin.BrowserBookmark.Views;
using Wox.Plugin.SharedCommands;
using Flow.Launcher.Infrastructure.Storage;
using Flow.Launcher.Plugin.BrowserBookmark.Commands;
using Flow.Launcher.Plugin.BrowserBookmark.Models;
using Flow.Launcher.Plugin.BrowserBookmark.Views;
using Flow.Launcher.Plugin.SharedCommands;

namespace Wox.Plugin.BrowserBookmark
namespace Flow.Launcher.Plugin.BrowserBookmark
{
public class Main : ISettingProvider, IPlugin, IReloadable, IPluginI18n, ISavable
{
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.BrowserBookmark/Models/Settings.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Wox.Plugin.BrowserBookmark.Models
namespace Flow.Launcher.Plugin.BrowserBookmark.Models
{
public class Settings : BaseModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="Wox.Plugin.BrowserBookmark.Views.SettingsControl"
<UserControl x:Class="Flow.Launcher.Plugin.BrowserBookmark.Views.SettingsControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Microsoft.Win32;
using System.Windows;
using System.Windows.Controls;
using Wox.Plugin.BrowserBookmark.Models;
using Flow.Launcher.Plugin.BrowserBookmark.Models;

namespace Wox.Plugin.BrowserBookmark.Views
namespace Flow.Launcher.Plugin.BrowserBookmark.Views
{
/// <summary>
/// Interaction logic for BrowserBookmark.xaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>{9B130CC5-14FB-41FF-B310-0A95B6894C37}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wox.Plugin.BrowserBookmark</RootNamespace>
<AssemblyName>Wox.Plugin.BrowserBookmark</AssemblyName>
<RootNamespace>Flow.Launcher.Plugin.BrowserBookmark</RootNamespace>
<AssemblyName>Flow.Launcher.Plugin.BrowserBookmark</AssemblyName>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
</PropertyGroup>
Expand All @@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Output\Debug\Plugins\Wox.Plugin.BrowserBookmark\</OutputPath>
<OutputPath>..\..\Output\Debug\Plugins\Flow.Launcher.Plugin.BrowserBookmark\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -24,7 +24,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Output\Release\Plugins\Wox.Plugin.BrowserBookmark\</OutputPath>
<OutputPath>..\..\Output\Release\Plugins\Flow.Launcher.Plugin.BrowserBookmark\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -55,8 +55,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
<ProjectReference Include="..\..\Wox.Plugin\Wox.Plugin.csproj" />
<ProjectReference Include="..\..\Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj" />
<ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.BrowserBookmark/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"Version":"1.1",
"Language":"csharp",
"Website":"http://www.getwox.com/plugin",
"ExecuteFileName":"Wox.Plugin.browserBookmark.dll",
"ExecuteFileName":"Flow.Launcher.Plugin.browserBookmark.dll",
"IcoPath":"Images\\bookmark.png"
}
4 changes: 2 additions & 2 deletions Plugins/Wox.Plugin.Calculator/DecimalSeparator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Wox.Core;
using Flow.Launcher.Core;

namespace Wox.Plugin.Caculator
namespace Flow.Launcher.Plugin.Caculator
{
[TypeConverter(typeof(LocalizationConverter))]
public enum DecimalSeparator
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.Calculator/Languages/de.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:system="clr-namespace:System;assembly=mscorlib">

<system:String x:Key="wox_plugin_caculator_plugin_name">Rechner</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">Stellt mathematische Berechnungen bereit.(Versuche 5*3-2 in Wox)</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">Stellt mathematische Berechnungen bereit.(Versuche 5*3-2 in Flow.Launcher)</system:String>
<system:String x:Key="wox_plugin_calculator_not_a_number">Keine Zahl (NaN)</system:String>
<system:String x:Key="wox_plugin_calculator_expression_not_complete">Ausdruck falsch oder nicht vollständig (Klammern vergessen?)</system:String>
<system:String x:Key="wox_plugin_calculator_copy_number_to_clipboard">Diese Zahl in die Zwischenablage kopieren</system:String>
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.Calculator/Languages/en.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:system="clr-namespace:System;assembly=mscorlib">

<system:String x:Key="wox_plugin_caculator_plugin_name">Calculator</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">Allows to do mathematical calculations.(Try 5*3-2 in Wox)</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">Allows to do mathematical calculations.(Try 5*3-2 in Flow.Launcher)</system:String>
<system:String x:Key="wox_plugin_calculator_not_a_number">Not a number (NaN)</system:String>
<system:String x:Key="wox_plugin_calculator_expression_not_complete">Expression wrong or incomplete (Did you forget some parentheses?)</system:String>
<system:String x:Key="wox_plugin_calculator_copy_number_to_clipboard">Copy this number to the clipboard</system:String>
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.Calculator/Languages/pl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
xmlns:system="clr-namespace:System;assembly=mscorlib">

<system:String x:Key="wox_plugin_caculator_plugin_name">Kalkulator</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">Szybkie wykonywanie obliczeń matematycznych. (Spróbuj wpisać 5*3-2 w oknie Woxa)</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">Szybkie wykonywanie obliczeń matematycznych. (Spróbuj wpisać 5*3-2 w oknie Flow.Launchera)</system:String>

</ResourceDictionary>
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.Calculator/Languages/zh-cn.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
xmlns:system="clr-namespace:System;assembly=mscorlib">

<system:String x:Key="wox_plugin_caculator_plugin_name">计算器</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">为Wox提供数学计算能力。(试着在Wox输入 5*3-2)</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">为Flow.Launcher提供数学计算能力。(试着在Flow.Launcher输入 5*3-2)</system:String>

</ResourceDictionary>
2 changes: 1 addition & 1 deletion Plugins/Wox.Plugin.Calculator/Languages/zh-tw.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
xmlns:system="clr-namespace:System;assembly=mscorlib">

<system:String x:Key="wox_plugin_caculator_plugin_name">計算機</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">為 Wox 提供數學計算功能。(試著在 Wox 輸入 5*3-2)</system:String>
<system:String x:Key="wox_plugin_caculator_plugin_description">為 Flow.Launcher 提供數學計算功能。(試著在 Flow.Launcher 輸入 5*3-2)</system:String>

</ResourceDictionary>
Loading

0 comments on commit 1b79530

Please sign in to comment.